diff --git a/app.json b/app.json
index e498c5168..5faa23bc2 100644
--- a/app.json
+++ b/app.json
@@ -29,5 +29,5 @@
"as": "POSTMARK"
}],
"image": "heroku/nodejs",
- "success_url": "/admin/setup"
+ "success_url": "/admin/install"
}
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 0e4f7e4a6..52876ff79 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -4,10 +4,10 @@ html, body {
}
body {
- font-family: 'Lato', sans-serif;
font-family: 'Open Sans', sans-serif;
+ font-family: 'Lato', sans-serif;
width: 100%;
- font-size: 12px;
+ font-size: 14px;
margin: 0px;
padding: 0px 0px 50px 0px;
}
@@ -17,16 +17,16 @@ body {
}
button {
- padding: 5px 10px;
- margin: 5px;
+ margin: 5px 10px 5px 0px;
background: none;
+ padding: 0px;
border: none;
+ font-size: inherit;
}
button:hover {
border-radius: 2px;
- color: #FFF;
- background-color: rgb(155, 155, 155);
+ color: #767676;
}
button i {
@@ -58,6 +58,17 @@ hr {
font-weight: bold;
}
+/* Coral sign in button */
+
+#coralSignInButton {
+ background-color: #2a2a2a;
+ color: #FFF;
+}
+
+#coralSignInButton:hover {
+ background-color: #767676;
+}
+
/* Info Box Styles */
.coral-plugin-infobox-info {
top: 0;
@@ -65,10 +76,9 @@ hr {
background: rgb(35,118,216);
color: white;
width: 100%;
- text-align: center;
+ text-align: left;
padding: 10px;
margin-bottom: 10px;
- font-weight: bold;
display: block;
}
@@ -157,19 +167,31 @@ hr {
}
.coral-plugin-commentcontent-text {
- margin-bottom: 10px;
+ margin-bottom: 7px;
}
.coral-plugin-author-name-text {
display: inline-block;
- margin-right: 10px;
- font-weight: bolder;
+ margin: 10px 8px 10px 0;
+ font-weight: bold;
}
.coral-plugin-author-name-bio-flag {
float: right;
}
+/* Tag Labels */
+
+.coral-plugin-tag-label {
+ background-color: #4C1066;
+ color: white;
+ display: inline-block;
+ margin: 10px 10px;
+ padding: 5px 5px;
+ border-radius: 2px;
+}
+
+
/* Reply styles */
@@ -206,8 +228,9 @@ hr {
}
.coral-plugin-pubdate-text {
- color: #CCC;
+ color: #696969;
display: inline-block;
+ font-size: .75rem;
}
.coral-plugin-permalinks-container {
diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js
index bca1d716b..67f61bc33 100644
--- a/client/coral-plugin-author-name/AuthorName.js
+++ b/client/coral-plugin-author-name/AuthorName.js
@@ -1,6 +1,5 @@
import React, {Component} from 'react';
const packagename = 'coral-plugin-author-name';
-import styles from './styles.css';
export default class AuthorName extends Component {
@@ -24,8 +23,7 @@ export default class AuthorName extends Component {
const {author} = this.props;
return (
+ className={`${packagename}-text`}>
{author && author.name}
);
diff --git a/client/coral-plugin-commentcontent/CommentContent.js b/client/coral-plugin-commentcontent/CommentContent.js
index 2dab237dd..501005b3d 100644
--- a/client/coral-plugin-commentcontent/CommentContent.js
+++ b/client/coral-plugin-commentcontent/CommentContent.js
@@ -1,5 +1,5 @@
import React from 'react';
-const name = 'coral-plugin-content';
+const name = 'coral-plugin-commentcontent';
const Content = ({body, styles}) => {
const textbreaks = body.split('\n');
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 1a99a5627..4c6cbb571 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -49,8 +49,8 @@ class PermalinkButton extends React.Component {
return (
+const TagLabel = ({isStaff}) =>
{isStaff ? 'Staff' : ''}
;
diff --git a/client/coral-plugin-tag-label/styles.css b/client/coral-plugin-tag-label/styles.css
deleted file mode 100644
index 03dc3dbc8..000000000
--- a/client/coral-plugin-tag-label/styles.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.staff {
- background-color: #4C1066;
- color: white;
- display: inline-block;
- margin: 10px 10px;
- padding: 5px 5px;
-}
diff --git a/client/coral-settings/components/NotLoggedIn.css b/client/coral-settings/components/NotLoggedIn.css
index f65e96507..c15c44c98 100644
--- a/client/coral-settings/components/NotLoggedIn.css
+++ b/client/coral-settings/components/NotLoggedIn.css
@@ -11,5 +11,4 @@
cursor: pointer;
margin: 0px;
padding-bottom: 2px;
- border-bottom: solid 1px black;
}
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index 095d43a8f..2e2b64181 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -1,6 +1,9 @@
import React from 'react';
import styles from './NotLoggedIn.css';
import SignInContainer from '../../coral-sign-in/containers/SignInContainer';
+import translations from '../translations';
+import I18n from 'coral-framework/modules/i18n/i18n';
+const lang = new I18n(translations);
export default ({showSignInDialog}) => (
- From the Settings Page you can
-
- - See your comment history
-
+ {lang.t('fromSettingsPage')}
);
diff --git a/client/coral-settings/translations.json b/client/coral-settings/translations.json
index e255e2b64..c8398bd7b 100644
--- a/client/coral-settings/translations.json
+++ b/client/coral-settings/translations.json
@@ -3,12 +3,18 @@
"userNoComment": "You've never left a comment. Join the conversation!",
"allComments": "All Comments",
"profileSettings": "Profile Settings",
- "myCommentHistory": "My comment History"
+ "myCommentHistory": "My comment History",
+ "signIn": "Sign in",
+ "toAccess": " to access Settings",
+ "fromSettingsPage": "From the Settings Page you can see your comment history."
},
"es":{
"userNoComment": "No has dejado áun ningún comentario. ¡Unete a la conversación!",
"allComments": "Todos los comentarios",
"profileSettings": "Configuración del perfil",
- "myCommentHistory": "Mi historial de comentarios"
+ "myCommentHistory": "Mi historial de comentarios",
+ "signIn": "Entrar",
+ "toAccess": "para acceder a la configuración",
+ "fromSettingsPage": "Desde la peagina de configuración puede ver su historia de comentarios."
}
}
diff --git a/client/coral-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css
index 617c8d1cb..31d4a4fed 100644
--- a/client/coral-sign-in/components/styles.css
+++ b/client/coral-sign-in/components/styles.css
@@ -36,6 +36,7 @@
.signInButton {
margin-top: 10px;
+ background-color: #2a2a2a;
}
.close {
diff --git a/client/coral-ui/components/Tab.css b/client/coral-ui/components/Tab.css
index dfd8d65f1..1d353c8fe 100644
--- a/client/coral-ui/components/Tab.css
+++ b/client/coral-ui/components/Tab.css
@@ -1,5 +1,6 @@
li.base--active {
background: white;
+ font-weight: bold;
}
li.material--active {
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
index 77b392b5f..fe7baf919 100644
--- a/views/embed/stream.ejs
+++ b/views/embed/stream.ejs
@@ -3,7 +3,7 @@
-
+
<% if (locals.customCssUrl) { %>