From 6a5f667336d7a382e8bc5458af0fdf04f05ab803 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 22 Mar 2017 13:20:26 -0300 Subject: [PATCH 1/3] hover, menu order --- .../coral-admin/src/components/ui/Header.css | 6 ++- .../components/ModerationMenu.js | 48 +++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css index e30cb46d7..eba94d892 100644 --- a/client/coral-admin/src/components/ui/Header.css +++ b/client/coral-admin/src/components/ui/Header.css @@ -74,8 +74,12 @@ background-color: transparent; transition: background-color 200ms; + &:hover { + background-color: #232323; + } + &.active { - background-color: #232323; + background-color: #232323; } } diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index b8160e21b..e428f6a52 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -1,35 +1,53 @@ -import React, {PropTypes} from 'react'; +import React, { PropTypes } from 'react'; import CommentCount from './CommentCount'; import styles from './styles.css'; -import {SelectField, Option} from 'react-mdl-selectfield'; +import { SelectField, Option } from 'react-mdl-selectfield'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; -import {Link} from 'react-router'; +import { Link } from 'react-router'; const lang = new I18n(translations); -const ModerationMenu = ({asset, premodCount, rejectedCount, flaggedCount, selectSort, sort}) => { - const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod'; - const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected'; - const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged'; +const ModerationMenu = ( + { asset, premodCount, rejectedCount, flaggedCount, selectSort, sort } +) => { + const premodPath = asset + ? `/admin/moderate/premod/${asset.id}` + : '/admin/moderate/premod'; + const rejectPath = asset + ? `/admin/moderate/rejected/${asset.id}` + : '/admin/moderate/rejected'; + const flagPath = asset + ? `/admin/moderate/flagged/${asset.id}` + : '/admin/moderate/flagged'; + return ( -
+
-
+
- + {lang.t('modqueue.premod')} - - {lang.t('modqueue.rejected')} - - + {lang.t('modqueue.flagged')} + + {lang.t('modqueue.rejected')} +
selectSort(sort)}> From cd27ffe86a46e929d8882807105e35dc837059b4 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 22 Mar 2017 13:37:44 -0300 Subject: [PATCH 2/3] wip --- .../src/containers/ModerationQueue/components/styles.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 9576045de..61902240b 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -216,10 +216,12 @@ span { justify-content: space-between; .author { - font-weight: 600; + font-weight: 300; min-width: 230px; display: flex; align-items: center; + color: #262626; + font-size: 16px; } } @@ -242,10 +244,11 @@ span { } .created { - color: #666; - font-size: 13px; + color: #262626; + font-size: 14px; margin-left: 15px; line-height: 1px; + font-weight: 300; } .actionButton { From 71415877b3afb5a37cff53be598f5b1a2e15768c Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 22 Mar 2017 14:04:08 -0300 Subject: [PATCH 3/3] comment tweaks --- .../src/containers/ModerationQueue/components/styles.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 61902240b..51086dfd4 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -170,7 +170,7 @@ span { border-bottom: 1px solid #e0e0e0; font-size: 18px; width: 100%; - max-width: 660px; + max-width: 700px; min-width: 400px; margin: 0 auto; position: relative; @@ -192,7 +192,7 @@ span { } &.selected { - max-width: 670px; + max-width: 720px; max-height: 410px; } @@ -263,6 +263,7 @@ span { max-width: 500px; word-wrap: break-word; font-weight: 300; + font-size: 16px; } .flagged {