From 1acc92a1f2e700ff06dc78561e1f96ec1f443d24 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 9 Jan 2017 12:45:41 -0300
Subject: [PATCH 01/18] Header Changes

---
 .../coral-admin/src/components/ui/Header.css  | 31 +++++++++++++------
 .../coral-admin/src/components/ui/Header.js   |  2 +-
 client/coral-admin/src/components/ui/Logo.css | 23 +++++++-------
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index a0d7dd30d..0de8f549a 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -1,22 +1,25 @@
 .header {
-    background: #505050;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 .header > div {
-    position: relative;
-    padding: 0;
-    width: 1170px;
-    margin: 0 auto;
+  background-color: #696969;
+  position: relative;
+  padding: 0;
+  width: 1170px;
+  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);
 }
 
 .active {
-    background: #232323;
+  background: #232323;
 }
 
 .rightPanel {
-    position: absolute;
-    right: 0;
-    width: 170px;
+  position: absolute;
+  right: 0;
+  width: 170px;
 }
 
 .rightPanel ul {
@@ -45,3 +48,13 @@
   background: rgba(158, 158, 158, 0.69);
   cursor: pointer;
 }
+
+.navLink {
+  padding: 0 20px;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.nav .navLink {
+  padding: 0 20px;
+}
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index 4c76424cc..4e2b391c8 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -9,7 +9,7 @@ import {Logo} from './Logo';
 export default ({handleLogout}) => (
   <Header className={styles.header}>
     <Logo />
-    <Navigation>
+    <Navigation className={styles.nav}>
       <IndexLink className={styles.navLink} to="/admin"
                  activeClassName={styles.active}>{lang.t('configure.moderate')}</IndexLink>
       <Link className={styles.navLink} to="/admin/community"
diff --git a/client/coral-admin/src/components/ui/Logo.css b/client/coral-admin/src/components/ui/Logo.css
index f89bf3d5d..cf831b0a2 100644
--- a/client/coral-admin/src/components/ui/Logo.css
+++ b/client/coral-admin/src/components/ui/Logo.css
@@ -1,21 +1,22 @@
 .logo h1 {
-    color: #272727;
-    font-size: 20px;
-    margin: 0;
-    line-height: 60px;
-    padding: 0 20px;
+  color: #272727;
+  font-size: 20px;
+  margin: 0;
+  line-height: 60px;
+  padding: 0 20px;
 }
 
 .logo span {
-    display: inline-block;
-    margin-left: 10px;
-    font-size: 18px;
-    vertical-align: middle;
+  display: inline-block;
+  margin-left: 10px;
+  font-size: 18px;
+  vertical-align: middle;
 }
 
 .logo {
-    background: #E5E5E5;
-    height: 100%;
+  background: #E5E5E5;
+  height: 100%;
+  width: 128px;
 }
 
 

From 226af72ac93f4520f1dd42a86b4277785977e48a Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 9 Jan 2017 12:54:28 -0300
Subject: [PATCH 02/18] Adding Roboto

---
 views/admin.ejs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/admin.ejs b/views/admin.ejs
index efcf1dfc9..9b585b653 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -5,6 +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 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">
@@ -13,6 +14,7 @@
         height: 100%;
         margin: 0;
         background: #fff;
+        font-family: 'Roboto', sans-serif;
       }
       /* putting this here until I can get webpack to behave */
       .react-tagsinput {

From 4f4ecd8dfb745e9b4c2b2bfa57685d294cfc6d0c Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 9 Jan 2017 18:07:02 -0300
Subject: [PATCH 03/18] header

---
 client/coral-admin/src/components/ui/Header.css | 9 ++++++++-
 client/coral-admin/src/components/ui/Logo.css   | 4 +++-
 client/coral-admin/src/components/ui/Logo.js    | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 0de8f549a..3be954f81 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -10,6 +10,8 @@
   width: 1170px;
   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;
+  overflow: hidden;
 }
 
 .active {
@@ -51,10 +53,15 @@
 
 .navLink {
   padding: 0 20px;
-  font-size: 16px;
+  font-size: 15px;
   font-weight: 500;
 }
 
+.nav {
+  height: auto;
+}
+
 .nav .navLink {
   padding: 0 20px;
+  letter-spacing: 0.4px;
 }
diff --git a/client/coral-admin/src/components/ui/Logo.css b/client/coral-admin/src/components/ui/Logo.css
index cf831b0a2..a4623cb39 100644
--- a/client/coral-admin/src/components/ui/Logo.css
+++ b/client/coral-admin/src/components/ui/Logo.css
@@ -3,7 +3,8 @@
   font-size: 20px;
   margin: 0;
   line-height: 60px;
-  padding: 0 20px;
+  padding-left: 13px;
+  margin-top: -4px;
 }
 
 .logo span {
@@ -11,6 +12,7 @@
   margin-left: 10px;
   font-size: 18px;
   vertical-align: middle;
+  font-weight: 500;
 }
 
 .logo {
diff --git a/client/coral-admin/src/components/ui/Logo.js b/client/coral-admin/src/components/ui/Logo.js
index df6c42f26..91db85e96 100644
--- a/client/coral-admin/src/components/ui/Logo.js
+++ b/client/coral-admin/src/components/ui/Logo.js
@@ -5,7 +5,7 @@ import {CoralLogo} from 'coral-ui';
 export const Logo = () => (
   <div className={styles.logo}>
     <h1>
-      <CoralLogo stroke="#E5E5E5" />
+      <CoralLogo stroke="#E5E5E5" height="35px" width="35px" />
       <span>Talk</span>
     </h1>
   </div>

From be293a03de48afad1adb7760d252af6f35e3c574 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Mon, 9 Jan 2017 19:17:21 -0300
Subject: [PATCH 04/18] Header

---
 client/coral-admin/src/components/ui/Header.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 3be954f81..22774baef 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -11,7 +11,6 @@
   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;
-  overflow: hidden;
 }
 
 .active {
@@ -27,18 +26,19 @@
 .rightPanel ul {
   list-style: none;
   line-height: 38px;
+  margin-right: 20px;
 }
 
 .rightPanel li {
   display: inline-block;
   float: right;
   margin-left: 15px;
+  font-size: 15px;
+  font-weight: 500;
 }
 
 .rightPanel .settings {
   vertical-align: middle;
-  border-radius: 3px;
-  border: solid 1px #9e9e9e;
   line-height: 10px;
 }
 
@@ -58,7 +58,8 @@
 }
 
 .nav {
-  height: auto;
+  overflow: hidden;
+  height: 58px !important;
 }
 
 .nav .navLink {

From a4e6638217cc4ad0c36ceeeef5036511effb0b5d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 10 Jan 2017 10:55:03 -0300
Subject: [PATCH 05/18] Tab bar, removing extra mdl js. It adds more events

---
 .../coral-admin/src/components/ui/Header.css  |  1 +
 .../ModerationQueue/ModerationQueue.css       | 21 ++++++++++++++++++-
 .../ModerationQueue/ModerationQueue.js        | 17 ++++++++-------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 22774baef..2073bd68a 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -1,6 +1,7 @@
 .header {
   background-color: transparent;
   box-shadow: none;
+  min-height: 58px;
 }
 
 .header > div {
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css
index 802fb88be..339672a3b 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.css
@@ -6,12 +6,31 @@
 }
 
 .tabBar {
-  background: #9E9E9E;
+  background: #262626;
+  z-index: 5;
 }
 
 .tab {
   flex: 1;
   color: white;
+  text-transform: capitalize;
+  font-weight: 500;
+  font-size: 15px;
+  letter-spacing: 1px;
+}
+
+.active {
+  color: white;
+  box-sizing: border-box;
+  border-bottom: solid 5px #F36451;
+}
+
+.active > span {
+  color: white;
+}
+
+.active:after {
+  background: transparent !important;
 }
 
 .showShortcuts {
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 55a2e705e..585760bf4 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -12,14 +12,17 @@ const lang = new I18n(translations);
 
 export default ({onTabClick, ...props}) => (
   <div>
-    <div className='mdl-tabs mdl-js-tabs mdl-js-ripple-effect'>
+    <div className='mdl-tabs'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <a href='#pending' onClick={() => onTabClick('pending')}
-           className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.pending')}</a>
-        <a href='#rejected' onClick={() => onTabClick('rejected')}
-           className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.rejected')}</a>
-        <a href='#flagged' onClick={() => onTabClick('flagged')}
-           className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.flagged')}</a>
+        <a href='#pending' onClick={() => onTabClick('pending')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`}>
+          {lang.t('modqueue.pending')}
+        </a>
+        <a href='#rejected' onClick={() => onTabClick('rejected')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}>
+          {lang.t('modqueue.rejected')}
+        </a>
+        <a href='#flagged' onClick={() => onTabClick('flagged')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}>
+          {lang.t('modqueue.flagged')}
+        </a>
       </div>
       <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
         <CommentList

From ca369dcb4abc4077aed85eb9d6f7d0d990a68307 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 10 Jan 2017 12:01:48 -0300
Subject: [PATCH 06/18] Header version

---
 client/coral-admin/src/components/ui/Header.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/ui/Header.css
index 2073bd68a..eae9b4331 100644
--- a/client/coral-admin/src/components/ui/Header.css
+++ b/client/coral-admin/src/components/ui/Header.css
@@ -22,11 +22,11 @@
   position: absolute;
   right: 0;
   width: 170px;
+  height: 100%;
 }
 
 .rightPanel ul {
   list-style: none;
-  line-height: 38px;
   margin-right: 20px;
 }
 
@@ -36,11 +36,11 @@
   margin-left: 15px;
   font-size: 15px;
   font-weight: 500;
+  line-height: 33px;
 }
 
 .rightPanel .settings {
-  vertical-align: middle;
-  line-height: 10px;
+  line-height: 0;
 }
 
 .rightPanel .settings > div {

From 3a510168d3392d20cb39ec3eb69eeb6fc0f5fe34 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 10 Jan 2017 16:12:15 -0300
Subject: [PATCH 07/18] design progress

---
 client/coral-admin/src/components/Comment.js  | 31 ++++++++--------
 .../src/components/CommentList.css            | 35 +++++++++++++++----
 .../coral-admin/src/components/ui/Header.css  |  2 +-
 .../coral-admin/src/components/ui/Layout.css  |  4 +--
 .../ModerationQueue/ModerationQueue.js        | 15 ++++++--
 client/coral-ui/components/Icon.js            |  8 +++++
 client/coral-ui/index.js                      |  1 +
 7 files changed, 68 insertions(+), 28 deletions(-)
 create mode 100644 client/coral-ui/components/Icon.js

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 (
-    <li tabIndex={props.index} className={`${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
+    <li tabIndex={props.index} className={`mdl-card mdl-shadow--2dp ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
       <div className={styles.itemHeader}>
         <div className={styles.author}>
-          <i className={`material-icons ${styles.avatar}`}>person</i>
           <span>{author.displayName || lang.t('comment.anon')}</span>
           <span className={styles.created}>{timeago().format(comment.createdAt || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}</span>
           {comment.flagged ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
         </div>
-        <div>
+        <div className={styles.sideActions}>
           {links ?
           <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
           <div className={`actions ${styles.actions}`}>
             {props.modActions.map((action, i) => getActionButton(action, i, props))}
           </div>
-        </div>
-        <div>
           {authorStatus === 'banned' ?
           <span className={styles.banned}><Icon name='error_outline'/> {lang.t('comment.banned_user')}</span> : null}
         </div>
@@ -65,15 +61,18 @@ const getActionButton = (action, i, props) => {
   }
   if (action === 'ban') {
     return (
-      <Button
-        className='ban'
-        cStyle='black'
-        disabled={banned ? 'disabled' : ''}
-        onClick={() => props.onClickShowBanDialog(author.id, author.displayName, comment.id)}
-        key={i}
-      >
-        {lang.t('comment.ban_user')}
-      </Button>
+      <div className={styles.ban}>
+        <Button
+          className={`ban ${styles.banButton}`}
+          cStyle='black'
+          disabled={banned ? 'disabled' : ''}
+          onClick={() => props.onClickShowBanDialog(author.id, author.displayName, comment.id)}
+          key={i}
+        >
+          <Icon name='not_interested' className={styles.banIcon} />
+          {lang.t('comment.ban_user')}
+        </Button>
+      </div>
     );
   }
   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}) => (
   <div>
     <div className='mdl-tabs'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
-        <a href='#pending' onClick={() => onTabClick('pending')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`}>
+        <a href='#pending'
+           onClick={() => onTabClick('pending')}
+           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'pending' ? styles.active : ''}`}
+        >
           {lang.t('modqueue.pending')}
         </a>
-        <a href='#rejected' onClick={() => onTabClick('rejected')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}>
+        <a href='#rejected'
+           onClick={() => onTabClick('rejected')}
+           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'rejected' ? styles.active : ''}`}
+        >
           {lang.t('modqueue.rejected')}
         </a>
-        <a href='#flagged' onClick={() => onTabClick('flagged')} className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}>
+        <a href='#flagged'
+           onClick={() => onTabClick('flagged')}
+           className={`mdl-tabs__tab ${styles.tab} ${props.activeTab === 'flagged' ? styles.active : ''}`}
+        >
           {lang.t('modqueue.flagged')}
         </a>
       </div>
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}) => (
+  <IconMDL classname={className} name={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';

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 08/18] 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">

From 3d65231db580a33ac9650a1323d02942285c4fc1 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 12 Jan 2017 13:27:37 -0300
Subject: [PATCH 09/18] Progress

---
 .../src/containers/Configure/Configure.css    |  4 --
 .../src/containers/Configure/Configure.js     | 38 +++++++------------
 client/coral-admin/src/translations.json      |  6 +--
 client/coral-ui/components/Item.css           | 23 +++++++++++
 client/coral-ui/components/Item.js            | 13 +++++++
 client/coral-ui/components/List.css           |  4 ++
 client/coral-ui/components/List.js            | 33 ++++++++++++++++
 client/coral-ui/components/TabBar.js          |  2 +-
 client/coral-ui/index.js                      |  2 +
 9 files changed, 93 insertions(+), 32 deletions(-)
 create mode 100644 client/coral-ui/components/Item.css
 create mode 100644 client/coral-ui/components/Item.js
 create mode 100644 client/coral-ui/components/List.css
 create mode 100644 client/coral-ui/components/List.js

diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 2b5c8d578..6ff47b969 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -11,10 +11,6 @@
   width: calc(70% - 300px)
 }
 
-.settingOption {
-  cursor: pointer;
-}
-
 .configSetting {
   border: 1px solid #ccc;
   border-radius: 4px;
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 9fc24ad53..c52ead796 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -6,13 +6,8 @@ import {
   saveSettingsToServer,
   updateWordlist,
 } from '../../actions/settings';
-import {
-  List,
-  ListItem,
-  ListItemContent,
-  Button,
-  Icon
-} from 'react-mdl';
+
+import {Button, Icon, List, Item} from 'coral-ui';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
@@ -99,7 +94,8 @@ class Configure extends React.Component {
   }
 
   render () {
-    const section = this.getSection(this.state.activeSection);
+    const {activeSection} = this.state;
+    const section = this.getSection(activeSection);
 
     const showSave = Object.keys(this.state.errors).reduce(
       (bool, error) => this.state.errors[error] ? false : bool, this.state.changed);
@@ -107,22 +103,16 @@ class Configure extends React.Component {
     return (
         <div className={styles.container}>
           <div className={styles.leftColumn}>
-            <List>
-              <ListItem className={styles.settingOption}>
-                <ListItemContent
-                  onClick={this.changeSection('comments')}
-                  icon='settings'>{lang.t('configure.comment-settings')}</ListItemContent>
-              </ListItem>
-              <ListItem className={styles.settingOption}>
-                <ListItemContent
-                  onClick={this.changeSection('embed')}
-                  icon='code'>{lang.t('configure.embed-comment-stream')}</ListItemContent>
-              </ListItem>
-              <ListItem className={styles.settingOption}>
-                <ListItemContent
-                  onClick={this.changeSection('wordlist')}
-                  icon='settings'>{lang.t('configure.wordlist')}</ListItemContent>
-              </ListItem>
+            <List onChange={this.changeSection} activeItem={activeSection}>
+              <Item itemId='comments' icon="settings">
+                {lang.t('configure.comment-settings')}
+              </Item>
+              <Item itemId='embed' icon='code'>
+                {lang.t('configure.embed-comment-stream')}
+              </Item>
+              <Item itemId='wordlist' icon='settings'>
+                {lang.t('configure.wordlist')}
+              </Item>
             </List>
             {
               showSave ?
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 0fbd1e7b9..3718732fe 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -46,13 +46,13 @@
       "include-comment-stream": "Include Comment Stream Description for Readers.",
       "include-comment-stream-desc": "Write a message to be added to the top of your comment stream. Pose a topic, include community guidelines, etc.",
       "include-text": "Include your text here.",
-      "comment-settings": "Comment Settings",
-      "embed-comment-stream": "Embed Comment Stream",
+      "comment-settings": "Settings",
+      "embed-comment-stream": "Embed Stream",
       "banned-word-header": "Write the banned words list",
       "suspect-word-header": "Write the suspect words list",
       "banned-word-text": "Comments which contain these words or phrases (not case-sensitive) will be automatically removed from the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
       "suspect-word-text": "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list.",
-      "wordlist": "Banned & Suspect Words",
+      "wordlist": "Banned Words",
       "banned-words-title": "Banned words list",
       "suspect-words-title": "Suspect words list",
       "save-changes": "Save Changes",
diff --git a/client/coral-ui/components/Item.css b/client/coral-ui/components/Item.css
new file mode 100644
index 000000000..2a9b76344
--- /dev/null
+++ b/client/coral-ui/components/Item.css
@@ -0,0 +1,23 @@
+.base {
+  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);
+  background: white;
+  width: 235px;
+  padding: 10px 14px;
+  font-size: 14px;
+  margin-bottom: 8px;
+  list-style: none;
+
+  &:hover {
+    cursor: pointer;
+   }
+
+  &.active {
+     background: red;
+   }
+
+  i {
+    margin-right: 13px;
+    font-size: 18px;
+    vertical-align: middle;
+  }
+}
diff --git a/client/coral-ui/components/Item.js b/client/coral-ui/components/Item.js
new file mode 100644
index 000000000..ecb81ab88
--- /dev/null
+++ b/client/coral-ui/components/Item.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import styles from './Item.css';
+import Icon from './Icon';
+
+export default ({children, itemId, active, onItemClick, className = '', icon}) => (
+  <li
+    className={`${styles.base} ${className} ${active ? styles.active : ''}`}
+    onClick={() => onItemClick(itemId)}
+  >
+    {icon && <Icon name={icon} />}
+    {children}
+  </li>
+);
diff --git a/client/coral-ui/components/List.css b/client/coral-ui/components/List.css
new file mode 100644
index 000000000..82dc6b010
--- /dev/null
+++ b/client/coral-ui/components/List.css
@@ -0,0 +1,4 @@
+.base {
+  padding: 0;
+  margin: 0;
+}
diff --git a/client/coral-ui/components/List.js b/client/coral-ui/components/List.js
new file mode 100644
index 000000000..e7a4a2e7f
--- /dev/null
+++ b/client/coral-ui/components/List.js
@@ -0,0 +1,33 @@
+import React, {Component} from 'react';
+import styles from './List.css';
+
+export default class List extends Component {
+  constructor(props) {
+    super(props);
+    this.handleClickItem = this.handleClickItem.bind(this);
+  }
+
+  handleClickItem(itemId) {
+    if (this.props.onChange) {
+      this.props.onChange(itemId);
+    }
+  }
+
+  render() {
+    const {children, activeItem, itemId, className = ''} = this.props;
+    return (
+      <ul className={`${styles.base} ${className}`}>
+        {React.Children.toArray(children)
+          .filter(child => !child.props.restricted)
+          .map((child, i) =>
+            React.cloneElement(child, {
+              i,
+              itemId: child.props.itemId,
+              active: itemId === activeItem,
+              onItemClick: this.handleClickItem,
+            })
+          )}
+      </ul>
+    );
+  }
+}
diff --git a/client/coral-ui/components/TabBar.js b/client/coral-ui/components/TabBar.js
index 2a673f78c..f22250194 100644
--- a/client/coral-ui/components/TabBar.js
+++ b/client/coral-ui/components/TabBar.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import styles from './TabBar.css';
 
-export class TabBar extends React.Component {
+class TabBar extends React.Component {
   constructor(props) {
     super(props);
     this.handleClickTab = this.handleClickTab.bind(this);
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index 54a4d6ead..9a30c133d 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -10,3 +10,5 @@ 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';
+export {default as List} from './components/List';
+export {default as Item} from './components/Item';

From c375d11e32c9c6a10f26c131b024853be9029cd9 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 12 Jan 2017 17:47:45 -0300
Subject: [PATCH 10/18] Coral UI -  List and Item

---
 client/coral-admin/src/containers/Configure/Configure.js | 8 +++++---
 client/coral-ui/components/Item.css                      | 5 +++--
 client/coral-ui/components/List.js                       | 5 ++---
 client/coral-ui/components/Tab.js                        | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index c52ead796..ef78679a9 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {
   fetchSettings,
@@ -16,7 +16,7 @@ import CommentSettings from './CommentSettings';
 import Wordlist from './Wordlist';
 import has from 'lodash/has';
 
-class Configure extends React.Component {
+class Configure extends Component {
   constructor (props) {
     super(props);
 
@@ -25,6 +25,8 @@ class Configure extends React.Component {
       changed: false,
       errors: {}
     };
+
+    this.changeSection = this.changeSection.bind(this);
   }
 
   componentWillMount = () => {
@@ -36,7 +38,7 @@ class Configure extends React.Component {
     this.setState({changed: false});
   }
 
-  changeSection = (activeSection) => () => {
+  changeSection(activeSection) {
     this.setState({activeSection});
   }
 
diff --git a/client/coral-ui/components/Item.css b/client/coral-ui/components/Item.css
index 2a9b76344..66787c6b9 100644
--- a/client/coral-ui/components/Item.css
+++ b/client/coral-ui/components/Item.css
@@ -1,6 +1,6 @@
 .base {
   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);
-  background: white;
+  background-color: white;
   width: 235px;
   padding: 10px 14px;
   font-size: 14px;
@@ -12,7 +12,8 @@
    }
 
   &.active {
-     background: red;
+     color: white;
+     background-color: #262626;
    }
 
   i {
diff --git a/client/coral-ui/components/List.js b/client/coral-ui/components/List.js
index e7a4a2e7f..500f2307d 100644
--- a/client/coral-ui/components/List.js
+++ b/client/coral-ui/components/List.js
@@ -14,7 +14,7 @@ export default class List extends Component {
   }
 
   render() {
-    const {children, activeItem, itemId, className = ''} = this.props;
+    const {children, activeItem, className = ''} = this.props;
     return (
       <ul className={`${styles.base} ${className}`}>
         {React.Children.toArray(children)
@@ -22,8 +22,7 @@ export default class List extends Component {
           .map((child, i) =>
             React.cloneElement(child, {
               i,
-              itemId: child.props.itemId,
-              active: itemId === activeItem,
+              active: child.props.itemId === activeItem,
               onItemClick: this.handleClickItem,
             })
           )}
diff --git a/client/coral-ui/components/Tab.js b/client/coral-ui/components/Tab.js
index af04bec9c..1d47de100 100644
--- a/client/coral-ui/components/Tab.js
+++ b/client/coral-ui/components/Tab.js
@@ -5,7 +5,7 @@ export default ({children, tabId, active, onTabClick, cStyle = 'base'}) => (
   <li
     key={tabId}
     className={active ? styles[`${cStyle}--active`] : ''}
-    onClick={() => onTabClick(tabId)}
+    onClick={onTabClick(tabId)}
   >
     {children}
   </li>

From 87b350e3a90a3f5a2f30ebaea0154f68417a781e Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 12 Jan 2017 17:56:00 -0300
Subject: [PATCH 11/18] Missing tab wrapper

---
 client/coral-ui/components/Tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-ui/components/Tab.js b/client/coral-ui/components/Tab.js
index 1d47de100..af04bec9c 100644
--- a/client/coral-ui/components/Tab.js
+++ b/client/coral-ui/components/Tab.js
@@ -5,7 +5,7 @@ export default ({children, tabId, active, onTabClick, cStyle = 'base'}) => (
   <li
     key={tabId}
     className={active ? styles[`${cStyle}--active`] : ''}
-    onClick={onTabClick(tabId)}
+    onClick={() => onTabClick(tabId)}
   >
     {children}
   </li>

From ce01389809e99ad1a244e7e3d90dba7e9580f693 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 12 Jan 2017 18:20:42 -0300
Subject: [PATCH 12/18] =?UTF-8?q?=C3=81dding=20Icon=20to=20Coral=20UI=20Bu?=
 =?UTF-8?q?tton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/containers/Configure/Configure.js     | 29 +++++++++++--------
 client/coral-ui/components/Button.js          |  4 ++-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index ef78679a9..92756c4a8 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -7,7 +7,7 @@ import {
   updateWordlist,
 } from '../../actions/settings';
 
-import {Button, Icon, List, Item} from 'coral-ui';
+import {Button, List, Item} from 'coral-ui';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
@@ -118,17 +118,22 @@ class Configure extends Component {
             </List>
             {
               showSave ?
-              <Button
-                raised
-                onClick={this.saveSettings}
-                className={styles.changedSave}>
-                <Icon name='check' /> {lang.t('configure.save-changes')}
-              </Button>
-              : <Button
-              raised
-              disabled>
-              {lang.t('configure.save-changes')}
-            </Button>
+                <Button
+                  raised
+                  onClick={this.saveSettings}
+                  className={styles.changedSave}
+                  icon='check'
+                >
+                  {lang.t('configure.save-changes')}
+                </Button>
+              :
+                <Button
+                  raised
+                  disabled
+                  icon='check'
+                >
+                {lang.t('configure.save-changes')}
+               </Button>
             }
 
           </div>
diff --git a/client/coral-ui/components/Button.js b/client/coral-ui/components/Button.js
index 7e908d525..52d806adb 100644
--- a/client/coral-ui/components/Button.js
+++ b/client/coral-ui/components/Button.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import styles from './Button.css';
+import Icon from './Icon';
 
-const Button = ({cStyle = 'local', children, className, raised = false, full = false, ...props}) => (
+const Button = ({cStyle = 'local', children, className, raised = false, full = false, icon = '', ...props}) => (
   <button
     className={`
       ${styles.button}
@@ -12,6 +13,7 @@ const Button = ({cStyle = 'local', children, className, raised = false, full = f
     `}
     {...props}
   >
+    {icon && <Icon name={icon} />}
     {children}
   </button>
 );

From 712c53389b33fc18a98104a9aac2b0527391aa58 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 13 Jan 2017 13:07:45 -0300
Subject: [PATCH 13/18] Banned Words and Suspect

---
 .../src/containers/Configure/Configure.css    | 22 +++++++++++++++----
 .../src/containers/Configure/Configure.js     |  4 ++++
 client/coral-ui/components/Button.css         | 10 +++++++--
 client/coral-ui/components/Item.css           |  4 ++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 6ff47b969..215c0e37f 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -1,14 +1,23 @@
 .container {
-  padding: 10px;
   display: flex;
+
+  h3 {
+    color: black;
+    font-size: 1.76em;
+    font-weight: 500;
+  }
 }
 
 .leftColumn {
-  width: 300px;
+  padding: 42px 56px;
+  width: 234px;
 }
 
 .mainContent {
-  width: calc(70% - 300px)
+  width: calc(100% - 300px);
+  padding: 10px 14px;
+  box-sizing: border-box;
+  max-width: 718px;
 }
 
 .configSetting {
@@ -81,7 +90,8 @@
 }
 
 .changedSave {
-  background-color:#4caf50;
+  background-color: #00796B;
+  color: white;
 }
 
 .copiedText {
@@ -132,3 +142,7 @@
 .hidden {
   display: none;
 }
+
+.saveBox {
+  margin-top: 38px;
+}
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 92756c4a8..8ad6cacfd 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -116,6 +116,7 @@ class Configure extends Component {
                 {lang.t('configure.wordlist')}
               </Item>
             </List>
+            <div className={styles.saveBox}>
             {
               showSave ?
                 <Button
@@ -123,6 +124,7 @@ class Configure extends Component {
                   onClick={this.saveSettings}
                   className={styles.changedSave}
                   icon='check'
+                  full
                 >
                   {lang.t('configure.save-changes')}
                 </Button>
@@ -131,10 +133,12 @@ class Configure extends Component {
                   raised
                   disabled
                   icon='check'
+                  full
                 >
                 {lang.t('configure.save-changes')}
                </Button>
             }
+            </div>
 
           </div>
           <div className={styles.mainContent}>
diff --git a/client/coral-ui/components/Button.css b/client/coral-ui/components/Button.css
index 7e307fdad..ece3779d6 100644
--- a/client/coral-ui/components/Button.css
+++ b/client/coral-ui/components/Button.css
@@ -11,8 +11,6 @@
     display: inline-block;
     font-family: 'Roboto','Helvetica','Arial',sans-serif;
     font-size: 14px;
-    font-weight: 500;
-    letter-spacing: 0;
     overflow: hidden;
     will-change: box-shadow,transform;
     -webkit-transition: box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);
@@ -24,6 +22,14 @@
     line-height: 28px;
     vertical-align: middle;
     margin: 2px;
+    letter-spacing: 0.7px;
+    font-weight: 400;
+
+    i {
+      margin-right: 13px;
+      font-size: 18px;
+      vertical-align: middle;
+    }
 }
 
 .type--black {
diff --git a/client/coral-ui/components/Item.css b/client/coral-ui/components/Item.css
index 66787c6b9..3a608d28c 100644
--- a/client/coral-ui/components/Item.css
+++ b/client/coral-ui/components/Item.css
@@ -1,10 +1,10 @@
 .base {
   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);
   background-color: white;
-  width: 235px;
+  width: 208px;
   padding: 10px 14px;
   font-size: 14px;
-  margin-bottom: 8px;
+  margin-bottom: 10px;
   list-style: none;
 
   &:hover {

From 9876e04454dd3d760f4d0a5b82a62a02ae5a7b2b Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 13 Jan 2017 13:54:45 -0300
Subject: [PATCH 14/18] Ban User box

---
 .../src/components/BanUserDialog.css          | 41 +++++++++++++------
 .../src/components/BanUserDialog.js           | 12 +++---
 .../src/containers/Configure/Configure.css    |  6 ++-
 .../src/containers/Configure/Wordlist.js      |  3 +-
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/client/coral-admin/src/components/BanUserDialog.css b/client/coral-admin/src/components/BanUserDialog.css
index dfac4f194..054c343dd 100644
--- a/client/coral-admin/src/components/BanUserDialog.css
+++ b/client/coral-admin/src/components/BanUserDialog.css
@@ -1,17 +1,25 @@
 .dialog {
-    border: none;
-    box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
-    width: 280px;
-    top: 10px;
-}
+  border: none;
+  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
+  width: 500px;
+  top: 50%;
+  transform: translateY(-50%);
+  height: 184px;
+  padding: 20px;
 
-.header {
-    margin-bottom: 20px;
-}
+  h2 {
+    color: black;
+    font-size: 1.76em;
+    font-weight: 500;
+    margin: 0;
+  }
 
-.header h1, .separator h1{
-    text-align: center;
-    font-size: 1.2em;
+  h3 {
+    color: black;
+    font-size: 1.4em;
+    font-weight: 500;
+    margin: 0;
+  }
 }
 
 .formField {
@@ -143,5 +151,14 @@ input.error{
 }
 
 .cancel {
-    margin: 10px 0;
+  margin-right: 10px;
+  width: 47%;
+}
+
+.ban {
+  width: 47%;
+}
+
+.buttons {
+  margin: 20px 0;
 }
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index b151d3020..c393df21d 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -19,23 +19,23 @@ const BanUserDialog = ({open, handleClose, onClickBanUser, user = {}}) => (
     <span className={styles.close} onClick={handleClose}>×</span>
     <div>
       <div className={styles.header}>
-        <h3>
+        <h2>
           {lang.t('bandialog.ban_user')}
-        </h3>
+        </h2>
       </div>
       <div className={styles.separator}>
-        <h4>
+        <h3>
           {lang.t('bandialog.are_you_sure', user.userName)}
-        </h4>
+        </h3>
         <i>
           {lang.t('bandialog.note')}
         </i>
       </div>
       <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={() => handleClose()} full>
+        <Button cStyle="cancel" className={styles.cancel} onClick={() => handleClose()} raised>
           {lang.t('bandialog.cancel')}
         </Button>
-        <Button cStyle="black" onClick={() => onClickBanUser(user.userId, user.commentId)} full>
+        <Button cStyle="black" className={styles.ban} onClick={() => onClickBanUser(user.userId, user.commentId)} raised>
           {lang.t('bandialog.yes_ban_user')}
         </Button>
       </div>
diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 215c0e37f..9615311f0 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -119,8 +119,12 @@
 }
 
 #bannedWordlist, #suspectWordlist {
+  width: 100%;
+  padding: 10px;
+
+  input {
     width: 100%;
-    padding: 10px;
+  }
 }
 
 .wordlistHeader {
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 595b5ea42..a0920c461 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -18,7 +18,8 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
         inputProps={{placeholder: 'word or phrase'}}
         addOnPaste={true}
         pasteSplit={data => data.split(',').map(d => d.trim())}
-        onChange={tags => onChangeWordlist('banned', tags)} />
+        onChange={tags => onChangeWordlist('banned', tags)}
+      />
     </Card>
     <h3>{lang.t('configure.suspect-words-title')}</h3>
     <Card id={styles.suspectWordlist} shadow={2}>

From e69262c665026df947120aaec1519a202c406396 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 13 Jan 2017 17:11:46 -0300
Subject: [PATCH 15/18] Community Section Ready

---
 .../coral-admin/src/components/ui/Layout.css  |  1 +
 .../src/containers/Community/Community.css    | 92 +++++++++++++++--
 .../src/containers/Community/Community.js     | 21 ++--
 .../src/containers/Community/Table.js         |  2 +
 .../containers/Configure/CommentSettings.js   | 99 +++++++++----------
 .../src/containers/Configure/Configure.css    | 35 +++++--
 .../src/containers/Configure/EmbedLink.js     | 16 ++-
 .../src/containers/Configure/Wordlist.js      |  8 +-
 .../src/containers/Streams/Streams.css        | 42 ++++++--
 .../src/containers/Streams/Streams.js         | 92 ++++++++---------
 client/coral-ui/components/Card.css           | 35 +++++++
 client/coral-ui/components/Card.js            |  8 ++
 client/coral-ui/components/Pager.css          | 19 +++-
 client/coral-ui/components/Pager.js           |  6 +-
 client/coral-ui/index.js                      |  2 +
 views/admin.ejs                               |  2 +-
 16 files changed, 318 insertions(+), 162 deletions(-)
 create mode 100644 client/coral-ui/components/Card.css
 create mode 100644 client/coral-ui/components/Card.js

diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css
index 71518b82d..792440d97 100644
--- a/client/coral-admin/src/components/ui/Layout.css
+++ b/client/coral-admin/src/components/ui/Layout.css
@@ -2,4 +2,5 @@
     max-width: 1280px;
     margin: 0 auto;
     overflow: hidden;
+    background-color: #FAFAFA;
 }
diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css
index cb6d408ee..7cd88a299 100644
--- a/client/coral-admin/src/containers/Community/Community.css
+++ b/client/coral-admin/src/containers/Community/Community.css
@@ -1,16 +1,49 @@
+.container {
+  padding: 10px;
+  display: flex;
+  padding-bottom: 200px;
+}
+
+.leftColumn {
+  padding: 42px 56px;
+  width: 234px;
+}
+
+.mainContent {
+  width: calc(100% - 300px);
+  padding: 34px 14px;
+  box-sizing: border-box;
+}
+
 .roleButton {
   display: block;
 }
 
-.searchInput {
-  display: block;
-  padding-left: 40px;
-  width: 100%
-}
-
 .searchBox {
+  width: 100%;
+  padding: 9px;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
   background: white;
-  max-width: 150px;
+  box-sizing: border-box;
+  height: 40px;
+
+  i {
+    color: #A1A1A1
+  }
+
+  input {
+    display: block;
+    width: 100%;
+    height: 100%;
+    border: none;
+    font-size: 16px;
+    padding: 0 2px 0 15px;
+    box-sizing: border-box;
+  }
 }
 
 .email {
@@ -18,5 +51,48 @@
 }
 
 .dataTable {
-  white-space: normal;
+  width: 100%;
+  border-left: none;
+  border-right: none;
+
+  th {
+    font-size: 1.1em;
+  }
+
+  th:nth-child(2), th:nth-child(3) {
+    width: 100px;
+  }
+}
+
+.selectField {
+  position: relative;
+  width: 150px;
+  height: 36px;
+  background: #2c2c2c;
+  padding: 10px 15px;
+  box-sizing: border-box;
+  color: white;
+  border-radius: 2px;
+  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);
+
+  > div {
+    padding: 0;
+  }
+
+  i {
+    position: absolute;
+    top: 7px;
+    right: 7px;
+  }
+
+  input {
+    padding: 0;
+    font-size: 13px;
+    letter-spacing: 0.7px;
+    font-weight: 400;
+  }
+
+  &:hover {
+    cursor: pointer;
+   }
 }
diff --git a/client/coral-admin/src/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js
index 0c725ed49..d63dd1e96 100644
--- a/client/coral-admin/src/containers/Community/Community.js
+++ b/client/coral-admin/src/containers/Community/Community.js
@@ -1,13 +1,12 @@
 import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
-import {Grid, Cell} from 'react-mdl';
 
 import styles from './Community.css';
 import Table from './Table';
 import Loading from './Loading';
 import NoResults from './NoResults';
-import Pager from 'coral-ui/components/Pager';
+import {Pager} from 'coral-ui';
 
 const lang = new I18n(translations);
 
@@ -33,17 +32,17 @@ const tableHeaders = [
 const Community = ({isFetching, commenters, ...props}) => {
   const hasResults = !isFetching && !!commenters.length;
   return (
-    <Grid>
-      <Cell col={2}>
+    <div className={styles.container}>
+      <div className={styles.leftColumn}>
         <form action="">
-          <div className={`mdl-textfield ${styles.searchBox}`}>
-            <label className="mdl-button mdl-js-button mdl-button--icon" htmlFor="commenters-search">
+          <div className={`${styles.searchBox}`}>
+            <label htmlFor="commenters-search">
               <i className="material-icons">search</i>
             </label>
             <div className="">
               <input
                 id="commenters-search"
-                className={`mdl-textfield__input ${styles.searchInput}`}
+                className={`${styles.searchInput}`}
                 type="text"
                 value={props.searchValue}
                 onKeyDown={props.onKeyDownHandler}
@@ -52,8 +51,8 @@ const Community = ({isFetching, commenters, ...props}) => {
             </div>
           </div>
         </form>
-      </Cell>
-      <Cell col={10}>
+      </div>
+      <div className={styles.mainContent}>
         { isFetching && <Loading /> }
         { !hasResults && <NoResults /> }
         { hasResults &&
@@ -68,8 +67,8 @@ const Community = ({isFetching, commenters, ...props}) => {
           page={props.page}
           onNewPageHandler={props.onNewPageHandler}
         />
-      </Cell>
-    </Grid>
+      </div>
+    </div>
   );
 };
 
diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js
index 1d81b1b2e..c146e564a 100644
--- a/client/coral-admin/src/containers/Community/Table.js
+++ b/client/coral-admin/src/containers/Community/Table.js
@@ -52,6 +52,7 @@ class Table extends Component {
               </td>
               <td className="mdl-data-table__cell--non-numeric">
                 <SelectField label={'Select me'} value={row.status || ''}
+                  className={styles.selectField}
                   label={lang.t('community.status')}
                   onChange={status => this.onCommenterStatusChange(row.id, status)}>
                   <Option value={'active'}>{lang.t('community.active')}</Option>
@@ -60,6 +61,7 @@ class Table extends Component {
               </td>
               <td className="mdl-data-table__cell--non-numeric">
                 <SelectField label={'Select me'} value={row.roles[0] || ''}
+                  className={styles.selectField}
                   label={lang.t('community.role')}
                   onChange={role => this.onRoleChange(row.id, role)}>
                   <Option value={''}>.</Option>
diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index 6000c1d43..a0c1177c2 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -3,15 +3,8 @@ import {SelectField, Option} from 'react-mdl-selectfield';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import styles from './Configure.css';
-import {
-  List,
-  ListItem,
-  ListItemContent,
-  ListItemAction,
-  Textfield,
-  Checkbox,
-  Icon
-} from 'react-mdl';
+import {Textfield, Checkbox} from 'react-mdl';
+import {Card, Icon, Spinner} from 'coral-ui';
 
 const TIMESTAMPS = {
   weeks: 60 * 60 * 24 * 7,
@@ -71,35 +64,32 @@ const updateClosedTimeout = (updateSettings, ts, isMeasure) => (event) => {
 
 const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError, settings, errors}) => {
   if (fetchingSettings) {
-
-    /* maybe a spinner here at some point */
-    return <p>Loading settings...</p>;
+    return <Card shadow="4"><Spinner/>Loading settings...</Card>;
   }
 
   return (
-    <div>
+    <div className={styles.commentSettingsSection}>
       <h3>{title}</h3>
-      <List>
-        <ListItem className={`${styles.configSetting} ${settings.moderation === 'pre' ? styles.enabledSetting : styles.disabledSetting}`}>
-          <ListItemAction>
+        <Card className={`${styles.configSetting} ${settings.moderation === 'pre' ? styles.enabledSetting : styles.disabledSetting}`}>
+          <div className={styles.action}>
             <Checkbox
               onChange={updateModeration(updateSettings, settings.moderation)}
               checked={settings.moderation === 'pre'} />
-          </ListItemAction>
-          <ListItemContent>
+          </div>
+          <div className={styles.content}>
           <div className={styles.settingsHeader}>{lang.t('configure.enable-pre-moderation')}</div>
           <p className={settings.moderation === 'pre' ? '' : styles.disabledSettingText}>
             {lang.t('configure.enable-pre-moderation-text')}
           </p>
-        </ListItemContent>
-        </ListItem>
-        <ListItem className={`${styles.configSetting} ${settings.charCountEnable ? styles.enabledSetting : styles.disabledSetting}`}>
-          <ListItemAction>
+        </div>
+        </Card>
+        <Card className={`${styles.configSetting} ${settings.charCountEnable ? styles.enabledSetting : styles.disabledSetting}`}>
+          <div className={styles.action}>
             <Checkbox
               onChange={updateCharCountEnable(updateSettings, settings.charCountEnable)}
               checked={settings.charCountEnable} />
-          </ListItemAction>
-          <ListItemContent>
+          </div>
+          <div className={styles.content}>
             <div className={styles.settingsHeader}>{lang.t('configure.comment-count-header')}</div>
             <p className={settings.charCountEnable ? '' : styles.disabledSettingText}>
               <span>{lang.t('configure.comment-count-text-pre')}</span>
@@ -118,32 +108,44 @@ const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError
                   </span>
                 }
             </p>
-          </ListItemContent>
-        </ListItem>
-        <ListItem threeLine className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? styles.enabledSetting : styles.disabledSetting}`}>
-          <ListItemAction>
+          </div>
+        </Card>
+        <Card className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? styles.enabledSetting : styles.disabledSetting}`}>
+          <div className={styles.action}>
             <Checkbox
               onChange={updateInfoBoxEnable(updateSettings, settings.infoBoxEnable)}
               checked={settings.infoBoxEnable} />
-          </ListItemAction>
-          <ListItemContent>
+          </div>
+          <div className={styles.content}>
             {lang.t('configure.include-comment-stream')}
             <p>
               {lang.t('configure.include-comment-stream-desc')}
             </p>
-          </ListItemContent>
-        </ListItem>
-        <ListItem className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? null : styles.hidden}`} >
-          <ListItemContent>
+            <div className={`${styles.configSettingInfoBox} ${settings.infoBoxEnable ? null : styles.hidden}`} >
+              <div className={styles.content}>
+                <Textfield
+                  onChange={updateInfoBoxContent(updateSettings)}
+                  value={settings.infoBoxContent}
+                  label={lang.t('configure.include-text')}
+                  rows={3}/>
+              </div>
+            </div>
+          </div>
+        </Card>
+        <Card className={styles.configSettingInfoBox}>
+          <div className={styles.content}>
+            {lang.t('configure.closed-comments-desc')}
+            <p>
             <Textfield
-              onChange={updateInfoBoxContent(updateSettings)}
-              value={settings.infoBoxContent}
-              label={lang.t('configure.include-text')}
+              onChange={updateClosedMessage(updateSettings)}
+              value={settings.closedMessage}
+              label={lang.t('configure.closed-comments-label')}
               rows={3}/>
-          </ListItemContent>
-        </ListItem>
-        <ListItem className={styles.configSettingInfoBox}>
-          <ListItemContent>
+            </p>
+          </div>
+        </Card>
+        <Card className={`${styles.configSettingInfoBox}`}>
+          <div className={styles.content}>
             {lang.t('configure.close-after')}
             <br />
             <Textfield
@@ -163,19 +165,8 @@ const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError
                 <Option value={'weeks'}>{lang.t('configure.weeks')}</Option>
               </SelectField>
             </div>
-          </ListItemContent>
-        </ListItem>
-        <ListItem className={styles.configSettingInfoBox}>
-          <ListItemContent>
-            {lang.t('configure.closed-comments-desc')}
-            <Textfield
-              onChange={updateClosedMessage(updateSettings)}
-              value={settings.closedMessage}
-              label={lang.t('configure.closed-comments-label')}
-              rows={3}/>
-          </ListItemContent>
-        </ListItem>
-      </List>
+          </div>
+        </Card>
     </div>
   );
 };
diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 9615311f0..1f23af30b 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -21,11 +21,9 @@
 }
 
 .configSetting {
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  height: 95px;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
   align-items: flex-start;
+  min-height: 100px;
 }
 
 .settingsError {
@@ -47,13 +45,13 @@
 }
 
 .configSettingInfoBox {
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  margin-bottom: 10px;
+  min-height: 100px;
+  margin-bottom: 20px;
   cursor: pointer;
   width: auto;
   height: auto;
   text-align: left;
+  overflow: visible;
 }
 
 .configSettingInfoBox p {
@@ -82,7 +80,7 @@
 }
 
 .charCountTexfieldEnabled {
-  border-color: #4caf50;
+  border-color: #00796b;
 }
 
 .charCountTexfield:focus {
@@ -95,7 +93,7 @@
 }
 
 .copiedText {
-  color: #008000;
+  color: #00796b;
   float: right;
   padding: 12px;
   font-size: 14px;
@@ -103,6 +101,7 @@
 
 .copyButton {
   float: right;
+  width: 200px;
 }
 
 .embedInput {
@@ -134,7 +133,7 @@
 }
 
 .enabledSetting {
-  border-left-color: #4caf50;
+  border-left-color: #00796b;
   border-left-style: solid;
   border-left-width: 7px;
 }
@@ -150,3 +149,19 @@
 .saveBox {
   margin-top: 38px;
 }
+
+.commentSettingsSection {
+  padding-bottom: 200px;
+  .action {
+    display: inline-block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 20px;
+  }
+
+  .content {
+    display: inline-block;
+    padding-left: 30px;
+  }
+}
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index 374d78ea3..105b531c5 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -2,11 +2,7 @@ import React, {Component} from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import styles from './Configure.css';
-import {
-  List,
-  ListItem,
-  Button
-} from 'react-mdl';
+import {Button, Card} from 'coral-ui';
 
 class EmbedLink extends Component {
 
@@ -34,16 +30,16 @@ class EmbedLink extends Component {
     return (
       <div>
         <h3>{this.props.title}</h3>
-        <List>
-          <ListItem className={styles.configSettingEmbed}>
+        <div>
+          <Card shadow="2">
             <p>{lang.t('configure.copy-and-paste')}</p>
             <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
-            <Button raised colored className={styles.copyButton} onClick={this.copyToClipBoard}>
+            <Button raised className={styles.copyButton} onClick={this.copyToClipBoard} cStyle="black">
               {lang.t('embedlink.copy')}
             </Button>
             <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
-          </ListItem>
-        </List>
+          </Card>
+        </div>
       </div>
     );
   }
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index a0920c461..1a808acc6 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -2,15 +2,13 @@ import React from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import TagsInput from 'react-tagsinput';
-
 import styles from './Configure.css';
-
-import {Card} from 'react-mdl';
+import {Card} from 'coral-ui';
 
 const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
   <div>
     <h3>{lang.t('configure.banned-words-title')}</h3>
-    <Card id={styles.bannedWordlist} shadow={2}>
+    <Card id={styles.bannedWordlist}>
       <p className={styles.wordlistHeader}>{lang.t('configure.banned-word-header')}</p>
       <p className={styles.wordlistDesc}>{lang.t('configure.banned-word-text')}</p>
       <TagsInput
@@ -22,7 +20,7 @@ const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
       />
     </Card>
     <h3>{lang.t('configure.suspect-words-title')}</h3>
-    <Card id={styles.suspectWordlist} shadow={2}>
+    <Card id={styles.suspectWordlist}>
       <p className={styles.wordlistHeader}>{lang.t('configure.suspect-word-header')}</p>
       <p className={styles.wordlistDesc}>{lang.t('configure.suspect-word-text')}</p>
       <TagsInput
diff --git a/client/coral-admin/src/containers/Streams/Streams.css b/client/coral-admin/src/containers/Streams/Streams.css
index c64de7974..26fb4f74f 100644
--- a/client/coral-admin/src/containers/Streams/Streams.css
+++ b/client/coral-admin/src/containers/Streams/Streams.css
@@ -4,11 +4,14 @@
 }
 
 .leftColumn {
-  width: 200px;
+  padding: 42px 56px;
+  width: 234px;
 }
 
 .mainContent {
-  width: calc(90% - 200px);
+  width: calc(100% - 300px);
+  padding: 34px 14px;
+  box-sizing: border-box;
 }
 
 .searchIcon {
@@ -18,11 +21,12 @@
 }
 
 .searchBox {
-  padding: 3px;
+  width: 100%;
+  padding: 9px;
   border: 1px solid #ccc;
-  border-radius: 3px;
-  width: 90%;
+  border-radius: 2px;
   display: flex;
+  background: white;
 }
 
 .searchBoxInput {
@@ -48,6 +52,16 @@
 
 .streamsTable {
   width: 100%;
+  border-left: none;
+  border-right: none;
+
+  th {
+    font-size: 1.1em;
+  }
+
+  th.status {
+    width: 100px;
+  }
 }
 
 .radio {
@@ -55,18 +69,20 @@
 }
 
 .statusMenu {
-  border-radius: 3px;
+  border-radius: 2px;
   width: 10em;
   text-align: center;
   float: right;
-  border: 1px solid #ccc;
   color: #fff;
   cursor: pointer;
+  letter-spacing: 0.7px;
+  font-weight: 400;
+  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);
 }
 
 .statusMenuOpen {
   padding: 10px;
-  background-color: #4caf50;
+  background-color: #268D81;
 }
 
 .statusMenuIcon {
@@ -75,9 +91,17 @@
 
 .statusMenuClosed {
   padding: 10px;
-  background-color: #000;
+  background-color: #262626;
 }
 
 .hidden {
   display: none;
 }
+
+.radioGroup {
+  margin-top: 5px;
+  span {
+    margin-bottom: 7px;
+    display: inline-block;
+  }
+}
diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js
index a154516dd..3c4b143b8 100644
--- a/client/coral-admin/src/containers/Streams/Streams.js
+++ b/client/coral-admin/src/containers/Streams/Streams.js
@@ -103,61 +103,63 @@ class Streams extends Component {
   render () {
     const {search, sort, filter} = this.state;
     const {assets} = this.props;
-
-    return <div className={styles.container}>
-      <div className={styles.leftColumn}>
-
-        <div className={styles.searchBox}>
-          <Icon name='search' className={styles.searchIcon}/>
-          <input
-            type='text'
-            value={search}
-            className={styles.searchBoxInput}
-            onChange={this.onSearchChange}
-            placeholder={lang.t('streams.search')}/>
-        </div>
-
-        <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
-        <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+    return (
+      <div className={styles.container}>
+        <div className={styles.leftColumn}>
+          <div className={styles.searchBox}>
+            <Icon name='search' className={styles.searchIcon}/>
+            <input
+              type='text'
+              value={search}
+              className={styles.searchBoxInput}
+              onChange={this.onSearchChange}
+              placeholder={lang.t('streams.search')}/>
+          </div>
+          <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
+          <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
           <RadioGroup
             name='status filter'
             value={filter}
             childContainer='div'
-            onChange={this.onSettingChange('filter')}>
+            onChange={this.onSettingChange('filter')}
+            className={styles.radioGroup}
+          >
             <Radio value='all'>{lang.t('streams.all')}</Radio>
             <Radio value='open'>{lang.t('streams.open')}</Radio>
             <Radio value='closed'>{lang.t('streams.closed')}</Radio>
           </RadioGroup>
           <div className={styles.optionHeader}>{lang.t('streams.sort-by')}</div>
-          <RadioGroup
-            name='sort by'
-            value={sort}
-            childContainer='div'
-            onChange={this.onSettingChange('sort')}>
-            <Radio value='desc'>{lang.t('streams.newest')}</Radio>
-            <Radio value='asc'>{lang.t('streams.oldest')}</Radio>
-          </RadioGroup>
+            <RadioGroup
+              name='sort by'
+              value={sort}
+              childContainer='div'
+              onChange={this.onSettingChange('sort')}
+              className={styles.radioGroup}
+            >
+              <Radio value='desc'>{lang.t('streams.newest')}</Radio>
+              <Radio value='asc'>{lang.t('streams.oldest')}</Radio>
+            </RadioGroup>
+          </div>
+        <div className={styles.mainContent}>
+          <DataTable
+          className={styles.streamsTable}
+          rows={assets.ids.map((id) => assets.byId[id])}>
+          <TableHeader name="title">{lang.t('streams.article')}</TableHeader>
+          <TableHeader name="publication_date" cellFormatter={this.renderDate}>
+            {lang.t('streams.pubdate')}
+          </TableHeader>
+          <TableHeader name="closedAt" cellFormatter={this.renderStatus} className={styles.status}>
+            {lang.t('streams.status')}
+          </TableHeader>
+          </DataTable>
+          <Pager
+          totalPages={Math.ceil((assets.count || 0) / limit)}
+          page={this.state.page}
+          onNewPageHandler={this.onPageClick}
+          />
+        </div>
       </div>
-
-      <div className={styles.mainContent}>
-      <DataTable
-        className={styles.streamsTable}
-        rows={assets.ids.map((id) => assets.byId[id])}>
-        <TableHeader name="title">{lang.t('streams.article')}</TableHeader>
-        <TableHeader numeric name="publication_date" cellFormatter={this.renderDate}>
-          {lang.t('streams.pubdate')}
-        </TableHeader>
-        <TableHeader numeric name="closedAt" cellFormatter={this.renderStatus}>
-          {lang.t('streams.status')}
-        </TableHeader>
-      </DataTable>
-      <Pager
-        totalPages={Math.ceil((assets.count || 0) / limit)}
-        page={this.state.page}
-        onNewPageHandler={this.onPageClick}
-      />
-      </div>
-    </div>;
+    );
   }
 }
 
diff --git a/client/coral-ui/components/Card.css b/client/coral-ui/components/Card.css
new file mode 100644
index 000000000..d4b5b1e91
--- /dev/null
+++ b/client/coral-ui/components/Card.css
@@ -0,0 +1,35 @@
+.base {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  font-size: 16px;
+  font-weight: 400;
+  min-height: 200px;
+  overflow: hidden;
+  width: 330px;
+  z-index: 1;
+  position: relative;
+  background: #fff;
+  border-radius: 2px;
+  box-sizing: border-box;
+
+  width: 100%;
+  padding: 20px;
+}
+
+.shadow--4 {
+  box-shadow: 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12), 0 2px 4px -1px rgba(0,0,0,.2);
+}
+
+.shadow--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);
+}
+
+.shadow--3 {
+  box-shadow: 0 3px 4px 0 rgba(0,0,0,.14), 0 3px 3px -2px rgba(0,0,0,.2), 0 1px 8px 0 rgba(0,0,0,.12);
+}
+
+
diff --git a/client/coral-ui/components/Card.js b/client/coral-ui/components/Card.js
new file mode 100644
index 000000000..0bdb490e7
--- /dev/null
+++ b/client/coral-ui/components/Card.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import styles from './Card.css';
+
+export default ({children, className, shadow = 2, ...props}) => (
+  <div className={`${styles.base} ${className} ${styles[`shadow--${shadow}`]}`} {...props}>
+    {children}
+  </div>
+);
diff --git a/client/coral-ui/components/Pager.css b/client/coral-ui/components/Pager.css
index 82e96f727..42559d11d 100644
--- a/client/coral-ui/components/Pager.css
+++ b/client/coral-ui/components/Pager.css
@@ -1,10 +1,19 @@
-.li {
+.pager {
+  text-align: center;
+
+  li {
     display: inline-block;
     margin-right: 5px;
-    padding: 0;
-    min-width: 30px;
+    color: white;
+    height: 30px;
+    text-align: center;
+    vertical-align: middle;
+    line-height: 30px;
+    width: 30px;
+  }
 }
 
 .current {
-    background: #e3edf3;
-}
\ No newline at end of file
+  background: #696969;
+  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/Pager.js b/client/coral-ui/components/Pager.js
index fca20b0db..ffd1b9d0a 100644
--- a/client/coral-ui/components/Pager.js
+++ b/client/coral-ui/components/Pager.js
@@ -2,19 +2,18 @@ import React, {PropTypes} from 'react';
 import styles from './Pager.css';
 
 const Rows = (curr, total, onClickHandler) => Array.from(Array(total)).map((e, i) =>
-  <li className={`mdl-button mdl-js-button ${styles.li} ${curr === i ? styles.current : ''}`}
+  <li className={curr === i ? styles.current : ''}
       key={i} onClick={() => onClickHandler(i + 1)}>
     {i + 1}
   </li>
 );
 
 const Pager = ({totalPages, page, onNewPageHandler}) => (
-  <div className="pager">
+  <div className={styles.pager}>
     <ul>
       {
         (totalPages > page && totalPages > 1) ?
           <li
-            className={`mdl-button mdl-js-button ${styles.li}`}
             onClick={() => onNewPageHandler(page - 1)}>
             Prev
           </li>
@@ -25,7 +24,6 @@ const Pager = ({totalPages, page, onNewPageHandler}) => (
       {
         (page < totalPages && totalPages > 1) ?
         <li
-          className={`mdl-button mdl-js-button ${styles.li}`}
           onClick={() => onNewPageHandler(page + 1)}>
           Next
         </li>
diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js
index 9a30c133d..23d5d876a 100644
--- a/client/coral-ui/index.js
+++ b/client/coral-ui/index.js
@@ -12,3 +12,5 @@ export {default as Checkbox} from './components/Checkbox';
 export {default as Icon} from './components/Icon';
 export {default as List} from './components/List';
 export {default as Item} from './components/Item';
+export {default as Card} from './components/Card';
+export {default as Pager} from './components/Pager';
diff --git a/views/admin.ejs b/views/admin.ejs
index 5f3eba53f..32d38734a 100644
--- a/views/admin.ejs
+++ b/views/admin.ejs
@@ -13,7 +13,7 @@
         width: 100%;
         height: 100%;
         margin: 0;
-        background: #fff;
+        background-color: #FAFAFA;
         font-family: 'Roboto', sans-serif;
       }
       /* putting this here until I can get webpack to behave */

From f0cc82cb6d905948359581d3d81a0117fc30b909 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 13 Jan 2017 18:16:46 -0300
Subject: [PATCH 16/18] Changes

---
 .../coral-admin/src/containers/Configure/CommentSettings.js   | 4 ++--
 .../src/containers/ModerationQueue/ModerationQueue.js         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index a0c1177c2..9fb3d75da 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -135,13 +135,13 @@ const CommentSettings = ({fetchingSettings, title, updateSettings, settingsError
         <Card className={styles.configSettingInfoBox}>
           <div className={styles.content}>
             {lang.t('configure.closed-comments-desc')}
-            <p>
+            <div>
             <Textfield
               onChange={updateClosedMessage(updateSettings)}
               value={settings.closedMessage}
               label={lang.t('configure.closed-comments-label')}
               rows={3}/>
-            </p>
+            </div>
           </div>
         </Card>
         <Card className={`${styles.configSettingInfoBox}`}>
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index e563af07f..9e8407116 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -77,7 +77,7 @@ export default ({onTabClick, ...props}) => (
       <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
         <CommentList
           suspectWords={props.settings.settings.wordlist.suspect}
-          isActive={props.activeTab === 'flagged'}
+          isActive={props.activeTab === 'rejected'}
           singleView={props.singleView}
           commentIds={props.flaggedIds}
           comments={props.comments.byId}

From 3640a93a2fc63841dfaa51cc9f6c560ef41faead Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 17 Jan 2017 16:25:47 -0300
Subject: [PATCH 17/18] Changes

---
 client/coral-admin/src/components/ui/Logo.css             | 6 +++++-
 client/coral-admin/src/components/ui/Logo.js              | 2 +-
 client/coral-admin/src/containers/Community/Community.css | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/components/ui/Logo.css b/client/coral-admin/src/components/ui/Logo.css
index a4623cb39..498d5596c 100644
--- a/client/coral-admin/src/components/ui/Logo.css
+++ b/client/coral-admin/src/components/ui/Logo.css
@@ -21,4 +21,8 @@
   width: 128px;
 }
 
-
+.base {
+  stroke: #E5E5E5;
+  height: 35px;
+  width: 35px;
+}
diff --git a/client/coral-admin/src/components/ui/Logo.js b/client/coral-admin/src/components/ui/Logo.js
index 91db85e96..05a7707d7 100644
--- a/client/coral-admin/src/components/ui/Logo.js
+++ b/client/coral-admin/src/components/ui/Logo.js
@@ -5,7 +5,7 @@ import {CoralLogo} from 'coral-ui';
 export const Logo = () => (
   <div className={styles.logo}>
     <h1>
-      <CoralLogo stroke="#E5E5E5" height="35px" width="35px" />
+      <CoralLogo className={styles.base} />
       <span>Talk</span>
     </h1>
   </div>
diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css
index 7cd88a299..6c101fcaf 100644
--- a/client/coral-admin/src/containers/Community/Community.css
+++ b/client/coral-admin/src/containers/Community/Community.css
@@ -24,8 +24,6 @@
   padding: 9px;
   border: 1px solid #ccc;
   border-radius: 2px;
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
   background: white;
   box-sizing: border-box;

From b5afd9cbeb35da71e8eb4524ba1bdbd77ec48622 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Tue, 17 Jan 2017 16:39:05 -0300
Subject: [PATCH 18/18] =?UTF-8?q?=C3=A7hanges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-ui/components/CoralLogo.css | 8 ++++++++
 client/coral-ui/components/CoralLogo.js  | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 client/coral-ui/components/CoralLogo.css

diff --git a/client/coral-ui/components/CoralLogo.css b/client/coral-ui/components/CoralLogo.css
new file mode 100644
index 000000000..6091cffcb
--- /dev/null
+++ b/client/coral-ui/components/CoralLogo.css
@@ -0,0 +1,8 @@
+.base {
+  height: 30px;
+  width : 30px;
+}
+
+.mark {
+  stroke: #FFFFFF;
+}
diff --git a/client/coral-ui/components/CoralLogo.js b/client/coral-ui/components/CoralLogo.js
index f85fd6f2d..002b0cabc 100644
--- a/client/coral-ui/components/CoralLogo.js
+++ b/client/coral-ui/components/CoralLogo.js
@@ -1,9 +1,10 @@
 import React, {PropTypes} from 'react';
+import styles from './CoralLogo.css';
 
-const CoralLogo = ({height = '30px', width = '30px', stroke = '#FFFFFF'}) => (
-  <svg width={width} height={height} viewBox='0 0 381 391' version='1.1 xmlns=http://www.w3.org/2000/svg xmlns:xlink=http://www.w3.org/1999/xlink'>
+const CoralLogo = ({className = ''}) => (
+  <svg className={`${styles.base} ${className}`} viewBox='0 0 381 391' version='1.1 xmlns=http://www.w3.org/2000/svg xmlns:xlink=http://www.w3.org/1999/xlink'>
   <g stroke='none' strokeWidth='1' fill='none' fillRule='evenodd'>
-    <g id='Wordmark-Round' transform='translate(-1833.000000, -411.000000)' stroke={stroke} strokeWidth='22' strokeLinecap='round' strokeLinejoin='round'>
+    <g id='Wordmark-Round' className={styles.mark} transform='translate(-1833.000000, -411.000000)' strokeWidth='22' strokeLinecap='round' strokeLinejoin='round'>
       <g id='coralProjectLogo-2-Copy-2' transform='translate(1842.000000, 421.000000)'>
         <g id='Layer_2' transform='translate(2.268750, 1.133903)'>
           <rect id='Rectangle-1' fill='#F47E6B' x='0' y='0' width='358.4625' height='368.518519' rx='40'>