diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index 17bd56714..6fe0793a9 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -7,9 +7,8 @@ import styles from './CommentList.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations.json'; -import {Icon} from 'react-mdl'; import Highlighter from 'react-highlight-words'; -import {FabButton, Button} from 'coral-ui'; +import {FabButton, Button, Icon} from 'coral-ui'; const linkify = new Linkify(); @@ -20,22 +19,19 @@ export default props => { const links = linkify.getMatches(comment.body); return ( -
  • +
  • - person {author.displayName || lang.t('comment.anon')} {timeago().format(comment.createdAt || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))} {comment.flagged ?

    {lang.t('comment.flagged')}

    : null}
    -
    +
    {links ? Contains Link : null}
    {props.modActions.map((action, i) => getActionButton(action, i, props))}
    -
    -
    {authorStatus === 'banned' ? {lang.t('comment.banned_user')} : null}
    @@ -65,15 +61,18 @@ const getActionButton = (action, i, props) => { } if (action === 'ban') { return ( - +
    + +
    ); } return ( diff --git a/client/coral-admin/src/components/CommentList.css b/client/coral-admin/src/components/CommentList.css index fddee7553..2d2762c45 100644 --- a/client/coral-admin/src/components/CommentList.css +++ b/client/coral-admin/src/components/CommentList.css @@ -38,11 +38,23 @@ border-bottom: 1px solid #e0e0e0; padding: 16px; font-size: 16px; + width: 100%; + max-width: 660px; + min-width: 400px; + margin: 0 auto; &:last-child { border-bottom: none; } + .sideActions { + position: absolute; + right: 0; + height: 100%; + top: 0; + padding: 30px 22px; + } + .itemHeader { display: flex; align-items: center; @@ -76,7 +88,7 @@ } .actionButton { - transform: scale(.7); + transform: scale(.8); margin: 0; } @@ -87,11 +99,6 @@ color: rgba(0,0,0,.54); } - .actions { - margin-left: 10px; - display: flex; - } - .flagged { color: rgba(255, 0, 0, .5); padding-top: 15px; @@ -143,3 +150,19 @@ margin-right: 5px; } } + +.ban { + display: block; + text-align: center; +} + +.banButton { + width: 114px; + letter-spacing: 1px; + + i { + vertical-align: middle; + margin-right: 10px; + font-size: 14px; + } +} diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css index eae9b4331..1c1174b07 100644 --- a/client/coral-admin/src/components/ui/Header.css +++ b/client/coral-admin/src/components/ui/Header.css @@ -8,7 +8,7 @@ background-color: #696969; position: relative; padding: 0; - width: 1170px; + min-width: 1280px; margin: 0 auto; box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12); height: 58px; diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css index 779dec8b9..881cfb051 100644 --- a/client/coral-admin/src/components/ui/Layout.css +++ b/client/coral-admin/src/components/ui/Layout.css @@ -1,4 +1,4 @@ .layout { - max-width: 1170px; + max-width: 1280px; margin: 0 auto; -} \ No newline at end of file +} diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js index 585760bf4..3dc745c0a 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js @@ -14,13 +14,22 @@ export default ({onTabClick, ...props}) => (
    - onTabClick('pending')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`}> + onTabClick('pending')} + className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`} + > {lang.t('modqueue.pending')} - onTabClick('rejected')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}> + onTabClick('rejected')} + className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`} + > {lang.t('modqueue.rejected')} - onTabClick('flagged')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}> + onTabClick('flagged')} + className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`} + > {lang.t('modqueue.flagged')}
    diff --git a/client/coral-ui/components/Icon.js b/client/coral-ui/components/Icon.js new file mode 100644 index 000000000..99027659b --- /dev/null +++ b/client/coral-ui/components/Icon.js @@ -0,0 +1,8 @@ +import React from 'react'; +import {Icon as IconMDL} from 'react-mdl'; + +const Icon = ({className, name}) => ( + +); + +export default Icon; diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js index 71b0d1d7e..54a4d6ead 100644 --- a/client/coral-ui/index.js +++ b/client/coral-ui/index.js @@ -9,3 +9,4 @@ export {default as Spinner} from './components/Spinner'; export {default as Tooltip} from './components/Tooltip'; export {default as PopupMenu} from './components/PopupMenu'; export {default as Checkbox} from './components/Checkbox'; +export {default as Icon} from './components/Icon';