From cbc69433053071aaa52cf2882431baaba5e5bb3f Mon Sep 17 00:00:00 2001
From: Ilya Daynatovich <shupuercha@gmail.com>
Date: Thu, 10 Nov 2016 18:48:34 +0200
Subject: [PATCH] work on colors

---
 css/_contact_list.scss           | 10 ++++++----
 css/_side_toolbar_container.scss |  4 ++--
 css/_toolbars.scss               |  4 ++--
 css/_variables.scss              |  9 ++-------
 css/aui-components/dropdown.scss |  2 +-
 css/themes/_light.scss           | 11 ++++++++++-
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/css/_contact_list.scss b/css/_contact_list.scss
index fa4f3d269..7a69c733b 100644
--- a/css/_contact_list.scss
+++ b/css/_contact_list.scss
@@ -5,7 +5,7 @@
         font-size: 12px;
         bottom: 0px;
         margin: 0;
-        margin-top: 16px;
+        margin-top: 12px;
         padding: 0px;
         width: 100%;
     }
@@ -23,13 +23,14 @@
 #contacts {
 
     >li {
-        color: $defaultSideBarFontColor;
+        display: block;
         list-style-type: none;
         text-align: left;
         white-space: nowrap;
         color: $baseLight;
-        font-size: 18px;
-        padding: 6px 10%;
+        font-size: 16px;
+        padding: 0 10%;
+        height: 27px;
 
         &:hover,
         &:active {
@@ -41,6 +42,7 @@
             vertical-align: middle;
             margin: 0px;
             width: 100%;
+            line-height: 1.5em;
             text-overflow: ellipsis;
             overflow: hidden;
         }
diff --git a/css/_side_toolbar_container.scss b/css/_side_toolbar_container.scss
index 2e4e6d8eb..93fcbd9a2 100644
--- a/css/_side_toolbar_container.scss
+++ b/css/_side_toolbar_container.scss
@@ -64,14 +64,14 @@
          * Titles and subtitles of inner containers.
          */
         div.title, div.subTitle {
-            margin: 10px 0;
+            margin: 24px 0 11px;
         }
 
         /**
          * Main title size.
          */
         div.title {
-            color: $toolbarTitleColor !important;
+            color: $toolbarTitleColor;
             text-align: center;
             font-size: $toolbarTitleFontSize;
         }
diff --git a/css/_toolbars.scss b/css/_toolbars.scss
index 206e0fdd2..7b7216fe5 100644
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -252,7 +252,7 @@ a.button>#avatar {
  */
 @include keyframes(slideInExt) {
     from { width: 0px; }
-    to   { width: 200px; } // TO FIX: Make this value a percentage.
+    to   { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
 }
 
 .slideInExt {
@@ -260,7 +260,7 @@ a.button>#avatar {
 }
 
 @include keyframes(slideOutExt) {
-  from { width: 200px; } // TO FIX: Make this value a percentage.
+  from { width: $sidebarWidth; } // TO FIX: Make this value a percentage.
   to   { width: 0px; }
 }
 
diff --git a/css/_variables.scss b/css/_variables.scss
index 2263b86e9..3a752f9e6 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -31,7 +31,7 @@ $tooltipBg: rgba(0,0,0, 0.7);
  * Toolbar
  */
 $toolbarTitleColor: #FFFFFF;
-$toolbarTitleFontSize: 24px;
+$toolbarTitleFontSize: 19px;
 $toolbarBackground: rgba(0, 0, 0, 0.5);
 $toolbarSelectBackground: rgba(0, 0, 0, .6);
 $toolbarBadgeBackground: #165ECC;
@@ -94,7 +94,7 @@ $notificationWidth: 215px;
  */
 $borderRadius: 3px;
 $defaultWatermarkLink: '../images/watermark.png';
-$sidebarWidth: 200px;
+$sidebarWidth: 220px;
 
 $happySoftwareBackground: transparent;
 
@@ -119,11 +119,6 @@ $defaultDarkFontColor: #000;
 /**
  * Forms
  */
-//dropdown
-$selectFontColor: $defaultLightFontColor;
-$selectBg: $defaultBackground;
-$selectActiveBg: $defaultBackground;
-$selectActiveItemBg: $defaultDarkColor;
 //inputs
 $inputControlEmColor: #f29424;
 //buttons
diff --git a/css/aui-components/dropdown.scss b/css/aui-components/dropdown.scss
index e78f42619..af6362356 100644
--- a/css/aui-components/dropdown.scss
+++ b/css/aui-components/dropdown.scss
@@ -1,6 +1,6 @@
-
 .select2-container.aui-select2-container {
     background-color: transparent !important;
+    margin-top: 2px;
 
     a.select2-choice {
         height: 28px !important;
diff --git a/css/themes/_light.scss b/css/themes/_light.scss
index 0ea80e1de..d2f200bd3 100644
--- a/css/themes/_light.scss
+++ b/css/themes/_light.scss
@@ -74,4 +74,13 @@ $popoverFontColor: #ffffff;
 $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
 
 // Toolbar
-$splitterColor: #ccc;
\ No newline at end of file
+$splitterColor: #ccc;
+
+/**
+ * Forms
+ */
+//dropdown
+$selectFontColor: $baseLight;
+$selectBg: $controlBackground;
+$selectActiveBg: darken($controlBackground, 5%);
+$selectActiveItemBg: darken($controlBackground, 10%);