From da732ece14e6cb940db0227ac1abbbc33e62daa9 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 15:03:09 -0500 Subject: [PATCH 1/7] Updating button padding and font size. --- client/coral-embed-stream/style/default.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 1deae6026..a99ec1bc7 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -7,7 +7,7 @@ body { font-family: 'Lato', sans-serif; font-family: 'Open Sans', sans-serif; width: 100%; - font-size: 12px; + font-size: 14px; margin: 0px; padding: 0px 0px 50px 0px; } @@ -18,9 +18,10 @@ body { button { padding: 5px 10px; - margin: 5px; + margin: 5px 10px 5px 0px; background: none; border: none; + font-size: inherit; } button:hover { @@ -208,6 +209,7 @@ hr { .coral-plugin-pubdate-text { color: #CCC; display: inline-block; + font-size: .75rem; } .coral-plugin-permalinks-container { From d73a6a87a4ed7592bda1dddc495a47db4142c3ff Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 15:19:38 -0500 Subject: [PATCH 2/7] Adding border radius to tag label. --- client/coral-embed-stream/style/default.css | 12 ++++++++++++ client/coral-plugin-tag-label/TagLabel.js | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index a99ec1bc7..315db2dd3 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -171,6 +171,18 @@ hr { 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 */ diff --git a/client/coral-plugin-tag-label/TagLabel.js b/client/coral-plugin-tag-label/TagLabel.js index 0bceca225..ba7403f5c 100644 --- a/client/coral-plugin-tag-label/TagLabel.js +++ b/client/coral-plugin-tag-label/TagLabel.js @@ -1,8 +1,6 @@ import React from 'react'; -import styles from './styles.css'; - -const TagLabel = ({isStaff}) =>
+const TagLabel = ({isStaff}) =>
{isStaff ? 'Staff' : ''}
; From 471607403ca184f6bea4e4485d87f80704252a50 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 15:26:02 -0500 Subject: [PATCH 3/7] Switching font. --- client/coral-embed-stream/style/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 315db2dd3..375dd0097 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -4,8 +4,8 @@ html, body { } body { - font-family: 'Lato', sans-serif; font-family: 'Open Sans', sans-serif; + font-family: 'Lato', sans-serif; width: 100%; font-size: 14px; margin: 0px; From 4cc3426af483983ae469ccf54b796ef88ad0e53b Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 16:07:41 -0500 Subject: [PATCH 4/7] Adding bolding, adding translations to settings page. --- client/coral-embed-stream/style/default.css | 9 ++++----- client/coral-plugin-author-name/AuthorName.js | 4 +--- client/coral-plugin-tag-label/styles.css | 7 ------- client/coral-settings/components/NotLoggedIn.js | 10 +++++----- client/coral-settings/translations.json | 10 ++++++++-- client/coral-ui/components/Tab.css | 1 + views/embed/stream.ejs | 2 +- 7 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 client/coral-plugin-tag-label/styles.css diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 375dd0097..35305f309 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -66,10 +66,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; } @@ -163,8 +162,8 @@ hr { .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 { @@ -219,7 +218,7 @@ hr { } .coral-plugin-pubdate-text { - color: #CCC; + color: #696969; display: inline-block; font-size: .75rem; } 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-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.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}) => (
@@ -9,13 +12,10 @@ export default ({showSignInDialog}) => ( { console.log('Signin click'); showSignInDialog(); - }}>Sign In to access Settings + }}>{lang.t('signIn')} {lang.t('toAccess')}
- 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 2a827a4f0..953708e61 100644 --- a/client/coral-settings/translations.json +++ b/client/coral-settings/translations.json @@ -3,12 +3,18 @@ "userNoComment": "This user has not yet left a comment.", "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": "Aún no ha escrito ningún comentario.", "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-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) { %> From c1e3aec1816b4b463f18456cb34987c49024cc09 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 16:20:20 -0500 Subject: [PATCH 5/7] Updating styles. --- client/coral-embed-stream/style/default.css | 7 +++++++ client/coral-settings/components/NotLoggedIn.css | 1 - client/coral-sign-in/components/styles.css | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 35305f309..9d6723082 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -59,6 +59,13 @@ hr { font-weight: bold; } +/* Coral sign in button */ + +#coralSignInButton { + background-color: #2a2a2a; + color: #FFF; +} + /* Info Box Styles */ .coral-plugin-infobox-info { top: 0; 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-sign-in/components/styles.css b/client/coral-sign-in/components/styles.css index 60a252a20..87e762ebf 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 { From e735fb800abfdbc81a513cd8e7c241e0a779a2e8 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 17:02:35 -0500 Subject: [PATCH 6/7] Updating button and signin style. --- client/coral-embed-stream/style/default.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 9d6723082..a4bec2400 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -17,17 +17,16 @@ body { } button { - padding: 5px 10px; 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 { @@ -66,6 +65,10 @@ hr { color: #FFF; } +#coralSignInButton:hover { + background-color: #767676; +} + /* Info Box Styles */ .coral-plugin-infobox-info { top: 0; From 39536046c969b7de2ec3509e82ffefe5a5d7b09b Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 23 Feb 2017 17:08:35 -0500 Subject: [PATCH 7/7] Fixing permalink icon and adding padding to comment content. --- client/coral-embed-stream/style/default.css | 2 +- client/coral-plugin-commentcontent/CommentContent.js | 2 +- client/coral-plugin-permalinks/PermalinkButton.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index a4bec2400..61965519b 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -167,7 +167,7 @@ hr { } .coral-plugin-commentcontent-text { - margin-bottom: 10px; + margin-bottom: 7px; } .coral-plugin-author-name-text { 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 (