From a9ae7a24f8144110f611da795dd0324499ad96bd Mon Sep 17 00:00:00 2001
From: Sean Li <mail@shang.li>
Date: Fri, 23 Jan 2015 11:19:23 -0800
Subject: [PATCH] Buttons and container list tweaks.

---
 app/Containers.react.js    |  2 +-
 app/styles/containers.less | 41 ++++++++++++++++++--------------------
 app/styles/theme.less      |  8 ++++++++
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/Containers.react.js b/app/Containers.react.js
index 6a31dfdf8d..5805ae017d 100644
--- a/app/Containers.react.js
+++ b/app/Containers.react.js
@@ -47,7 +47,7 @@ var Containers = React.createClass({
               <div className="create">
                 <ModalTrigger modal={<ContainerModal/>}>
                   <div className="wrapper">
-                    <span className="icon icon-add-3"></span>
+                    <a className="btn btn-action only-icon"><span className="icon icon-add-1"></span></a>
                   </div>
                 </ModalTrigger>
               </div>
diff --git a/app/styles/containers.less b/app/styles/containers.less
index 6e8fa55043..ccd494058e 100644
--- a/app/styles/containers.less
+++ b/app/styles/containers.less
@@ -10,10 +10,11 @@
     .sidebar {
       display: flex;
       flex-direction: column;
-      min-width: 240px;
+      min-width: 280px;
       margin: 0;
       box-sizing: border-box;
       border-right: 1px solid #eee;
+      //padding: 10px 26px 0px 10px;
 
       .sidebar-header {
         flex: 0 auto;
@@ -22,6 +23,7 @@
         display: flex;
         border-bottom: 1px solid transparent;
         transition: border-bottom 0.25s;
+        padding: 0px 28px 0px 10px;
 
         &.sep {
           border-bottom: 1px solid #eee;
@@ -46,22 +48,6 @@
           .wrapper {
             text-align: center;
             display: inline-block;
-            width: 50px;
-
-            span.icon {
-              margin-top: 5px;
-              margin-left: auto;
-              display: inline-block;
-              border-radius: 20px;
-              font-size: 26px;
-              color: @brand-primary;
-            }
-
-            &:hover {
-              span.icon {
-                color: darken(@brand-primary, 20%);
-              }
-            }
           }
 
         }
@@ -90,10 +76,22 @@
             color: inherit;
             flex-shrink: 0;
             cursor: default;
+            margin: 0px 5px 0px 20px;
 
             &.active {
-                background: #eee;
+                background: @brand-primary;
+                li {
+                  .name {
+                    color: white;
+                  }
+                  .image {
+                    color: white;
+                    opacity: 0.9;
+                  }
+                }
+                color: white;
                 border-bottom: none;
+                border-radius: 40px;
 
               &:hover {
               }
@@ -110,8 +108,7 @@
 
           li {
             vertical-align: middle;
-            padding-bottom: 14px;
-            margin: 16px 24px 0px;
+            padding: 10px 16px 10px 16px;
 
             display: flex;
             flex-direction: row;
@@ -126,10 +123,10 @@
                 overflow: hidden;
                 font-size: 14px;
                 font-weight: 400;
-                color: #555;
+                color: @gray-darkest;
               }
               .image {
-                color: #999;
+                color: @gray-lighter;
                 font-size: 12px;
                 font-weight: 400;
                 text-overflow: ellipsis;
diff --git a/app/styles/theme.less b/app/styles/theme.less
index a369f7b300..9cf0707fe1 100644
--- a/app/styles/theme.less
+++ b/app/styles/theme.less
@@ -60,6 +60,12 @@
         margin-right: 4px;
       }
     }
+    &.only-icon {
+      padding: 0px 14px 0px 14px;
+      .icon:before {
+        top: 5px;
+      }
+    }
   }
 }
 
@@ -82,7 +88,9 @@
     margin-right: 4px;
   }
   &.only-icon {
+    padding: 0px 5px 10px 5px;
     .icon:before {
+      position: relative;
       margin-right: 0px;
     }
   }