From 4a4affad706597317ffbbcca7daaec355e4717c8 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 12 Jan 2017 09:16:23 -0300
Subject: [PATCH] More Design Tweaks

---
 client/coral-admin/src/components/Comment.js  |  3 ++-
 .../src/components/CommentList.css            | 21 +++++++++++-----
 .../coral-admin/src/components/ui/Header.css  | 10 ++++----
 .../coral-admin/src/components/ui/Layout.css  |  1 +
 .../src/containers/Community/Community.css    | 17 ++++++++-----
 .../src/containers/Community/Community.js     |  2 +-
 .../ModerationQueue/ModerationQueue.css       |  1 +
 .../ModerationQueue/ModerationQueue.js        | 15 +++++++++---
 client/coral-ui/components/Button.css         |  3 +--
 client/coral-ui/components/Button.js          |  6 ++---
 client/coral-ui/components/FabButton.css      | 24 +++++++++++++++----
 client/coral-ui/components/FabButton.js       |  2 +-
 client/coral-ui/components/Icon.js            |  2 +-
 views/admin.ejs                               |  2 +-
 14 files changed, 76 insertions(+), 33 deletions(-)

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) => {
       <div className={styles.ban}>
         <Button
           className={`ban ${styles.banButton}`}
-          cStyle='black'
+          cStyle='darkGrey'
           disabled={banned ? 'disabled' : ''}
           onClick={() => props.onClickShowBanDialog(author.id, author.displayName, comment.id)}
           key={i}
+          raised
         >
           <Icon name='not_interested' className={styles.banIcon} />
           {lang.t('comment.ban_user')}
diff --git a/client/coral-admin/src/components/CommentList.css b/client/coral-admin/src/components/CommentList.css
index 2d2762c45..b90da3166 100644
--- a/client/coral-admin/src/components/CommentList.css
+++ b/client/coral-admin/src/components/CommentList.css
@@ -36,12 +36,19 @@
 
 .listItem {
   border-bottom: 1px solid #e0e0e0;
-  padding: 16px;
   font-size: 16px;
   width: 100%;
   max-width: 660px;
   min-width: 400px;
   margin: 0 auto;
+  padding: 16px 14px;
+  position: relative;
+  transition: box-shadow 200ms;
+
+
+  &:hover {
+     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+  }
 
   &:last-child {
     border-bottom: none;
@@ -52,7 +59,8 @@
      right: 0;
      height: 100%;
      top: 0;
-     padding: 30px 22px;
+     padding: 40px 18px;
+     box-sizing: border-box;
    }
 
   .itemHeader {
@@ -83,8 +91,8 @@
 
   .created {
     color: #666;
-    font-size: 10px;
-    margin-left: 10px;
+    font-size: 13px;
+    margin-left: 40px;
   }
 
   .actionButton {
@@ -95,8 +103,8 @@
   .body {
     margin-top: 20px;
     flex: 1;
-    font-size: 1em;
-    color: rgba(0,0,0,.54);
+    font-size: 0.88em;
+    color: black;
   }
 
   .flagged {
@@ -154,6 +162,7 @@
 .ban {
   display: block;
   text-align: center;
+  margin-top: 5px;
 }
 
 .banButton {
diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 1c1174b07..8fbdedc0a 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -14,10 +14,6 @@
   height: 58px;
 }
 
-.active {
-  background: #232323;
-}
-
 .rightPanel {
   position: absolute;
   right: 0;
@@ -56,6 +52,12 @@
   padding: 0 20px;
   font-size: 15px;
   font-weight: 500;
+  background-color: transparent;
+  transition: background-color 200ms;
+
+  &.active {
+     background-color: #232323;
+  }
 }
 
 .nav {
diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css
index 881cfb051..71518b82d 100644
--- a/client/coral-admin/src/components/ui/Layout.css
+++ b/client/coral-admin/src/components/ui/Layout.css
@@ -1,4 +1,5 @@
 .layout {
     max-width: 1280px;
     margin: 0 auto;
+    overflow: hidden;
 }
diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css
index b19d0261d..cb6d408ee 100644
--- a/client/coral-admin/src/containers/Community/Community.css
+++ b/client/coral-admin/src/containers/Community/Community.css
@@ -1,17 +1,22 @@
 .roleButton {
-    display: block;
+  display: block;
 }
 
 .searchInput {
-    display: block;
-    padding-left: 40px;
-    width: auto;
+  display: block;
+  padding-left: 40px;
+  width: 100%
 }
 
 .searchBox {
-    background: white;
+  background: white;
+  max-width: 150px;
 }
 
 .email {
-    display: block;
+  display: block;
+}
+
+.dataTable {
+  white-space: normal;
 }
diff --git a/client/coral-admin/src/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js
index 286a7f364..0c725ed49 100644
--- a/client/coral-admin/src/containers/Community/Community.js
+++ b/client/coral-admin/src/containers/Community/Community.js
@@ -53,7 +53,7 @@ const Community = ({isFetching, commenters, ...props}) => {
           </div>
         </form>
       </Cell>
-      <Cell col={6}>
+      <Cell col={10}>
         { isFetching && <Loading /> }
         { !hasResults && <NoResults /> }
         { 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}) => (
     <div className='mdl-tabs'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
         <a href='#pending'
-           onClick={() => onTabClick('pending')}
+           onClick={(e) => {
+             e.preventDefault();
+             onTabClick('pending');
+           }}
            className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`}
         >
           {lang.t('modqueue.pending')}
         </a>
         <a href='#rejected'
-           onClick={() => onTabClick('rejected')}
+           onClick={(e) => {
+             e.preventDefault();
+             onTabClick('rejected');
+           }}
            className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}
         >
           {lang.t('modqueue.rejected')}
         </a>
         <a href='#flagged'
-           onClick={() => 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}) => (
   <button
     className={`
       ${styles.button}
       ${styles[`type--${cStyle}`]}
       ${className}
-      ${full && styles.full}
-      ${raised && styles.button}
+      ${full ? styles.full : ''}
+      ${raised ? styles.raised : ''}
     `}
     {...props}
   >
diff --git a/client/coral-ui/components/FabButton.css b/client/coral-ui/components/FabButton.css
index 688190407..c90d857d9 100644
--- a/client/coral-ui/components/FabButton.css
+++ b/client/coral-ui/components/FabButton.css
@@ -1,9 +1,25 @@
+.base {
+  background: red;
+  i {
+    font-size: 30px;
+    transform: translate(-14px,-12px) !important;
+  }
+}
+
 .type--approve {
-    background: #00796b;
-    color: rgba(255, 255, 255, 0.901961);
+  background: #388E3C;
+  color: rgba(255, 255, 255, 0.901961);
+}
+
+.type--approve:hover {
+  background: #40a244;
 }
 
 .type--reject {
-    background: #d32f2f ;
-    color: rgba(255, 255, 255, 0.901961);
+  background: #D32F2F ;
+  color: rgba(255, 255, 255, 0.901961);
+}
+
+.type--reject:hover {
+  background: #e53333;
 }
diff --git a/client/coral-ui/components/FabButton.js b/client/coral-ui/components/FabButton.js
index df48af55d..64ba4e82a 100644
--- a/client/coral-ui/components/FabButton.js
+++ b/client/coral-ui/components/FabButton.js
@@ -3,7 +3,7 @@ import styles from './FabButton.css';
 import {FABButton, Icon} from 'react-mdl';
 
 const FabButton = ({cStyle = 'local', icon, className, ...props}) => (
-  <FABButton className={`${styles[`type--${cStyle}`]} ${className ? className : ''}`}  {...props}>
+  <FABButton className={`${styles.base} ${styles[`type--${cStyle}`]} ${className ? className : ''}`}  {...props}>
     <Icon name={icon} />
   </FABButton>
 );
diff --git a/client/coral-ui/components/Icon.js b/client/coral-ui/components/Icon.js
index 99027659b..65bf52f72 100644
--- a/client/coral-ui/components/Icon.js
+++ b/client/coral-ui/components/Icon.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {Icon as IconMDL}  from 'react-mdl';
 
 const Icon = ({className, name}) => (
-  <IconMDL classname={className} name={name} />
+  <IconMDL className={className} name={name} />
 );
 
 export default Icon;
diff --git a/views/admin.ejs b/views/admin.ejs
index 9b585b653..5f3eba53f 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1">
     <meta property="csrf" content="<%= csrfToken %>">
     <title>Talk - Coral Admin</title>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
     <style media="screen">