diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index 6fe0793a9..0eb4fce95 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -64,10 +64,11 @@ const getActionButton = (action, i, props) => {
- + { isFetching && } { !hasResults && } { hasResults && diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css index 339672a3b..84ee8b923 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css @@ -17,6 +17,7 @@ font-weight: 500; font-size: 15px; letter-spacing: 1px; + transition: border-bottom 200ms; } .active { diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js index 3dc745c0a..9e8407116 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js @@ -15,19 +15,28 @@ export default ({onTabClick, ...props}) => (
onTabClick('pending')} + onClick={(e) => { + e.preventDefault(); + onTabClick('pending'); + }} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`} > {lang.t('modqueue.pending')} onTabClick('rejected')} + onClick={(e) => { + e.preventDefault(); + onTabClick('rejected'); + }} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`} > {lang.t('modqueue.rejected')} onTabClick('flagged')} + onClick={(e) => { + e.preventDefault(); + onTabClick('flagged'); + }} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`} > {lang.t('modqueue.flagged')} diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css index 3a624463c..7e307fdad 100644 --- a/client/coral-ui/components/Button.css +++ b/client/coral-ui/components/Button.css @@ -69,7 +69,7 @@ .type--darkGrey { color: white; - background: #696969; + background: #616161; } .type--darkGrey:hover { @@ -104,6 +104,5 @@ } .raised { - background: rgba(158,158,158,.2); 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); } diff --git a/client/coral-ui/components/Button.js b/client/coral-ui/components/Button.js index 44e728f51..7e908d525 100644 --- a/client/coral-ui/components/Button.js +++ b/client/coral-ui/components/Button.js @@ -1,14 +1,14 @@ import React from 'react'; import styles from './Button.css'; -const Button = ({cStyle = 'local', children, className, raised, full, ...props}) => ( +const Button = ({cStyle = 'local', children, className, raised = false, full = false, ...props}) => (