From 7c2d1111abecd13fad04dd67720cd8e586bb4eda Mon Sep 17 00:00:00 2001
From: Thibault Cohen <titilambert@gmail.com>
Date: Mon, 29 Jun 2015 14:29:48 -0400
Subject: [PATCH] Add true light theme

Change-Id: I397b90c4bd90c1698fd87d54fa95b8ff116da005
---
 app/assets/sass/global/_color-schemes.scss    | 14 +++++-----
 app/assets/sass/modules-interface/_main.scss  |  4 +--
 .../sass/modules-objects/_data-table.scss     |  8 +++---
 app/assets/sass/modules-objects/_filters.scss |  6 ++--
 app/assets/sass/modules-objects/_panes.scss   |  2 +-
 app/assets/sass/settings/_variables.scss      | 15 +++++-----
 app/assets/sass/temporary.scss                |  4 +--
 app/components/sidebar/_sidebar.scss          | 28 +++++++++++--------
 app/components/topbar/_topbar.scss            |  3 +-
 9 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/app/assets/sass/global/_color-schemes.scss b/app/assets/sass/global/_color-schemes.scss
index 904ec40..3d112b8 100644
--- a/app/assets/sass/global/_color-schemes.scss
+++ b/app/assets/sass/global/_color-schemes.scss
@@ -16,7 +16,7 @@
 
     // For panel and the sidebar
     %colorBkgPanel {
-        background:$_color_light_beta;
+        background:$_color_light_alpha;
     }
 
     %colorLink {
@@ -30,20 +30,20 @@
     }
 
     %colorBorderThin {
-        border-color:$_color_light_epsilon;
+        border-color:$_color_light_alpha;
     }
 
     %colorBkgTopbar {
-        background:$_color_light_alpha;
-    }
-
-    %colorBkgTopbarPanel {
         background:$_color_light_beta;
     }
 
-    %colorBkgTopbarButton {
+    %colorBkgTopbarPanel {
         background:$_color_light_alpha;
     }
+
+    %colorBkgTopbarButton {
+        background:$_color_light_beta;
+    }
 }
 
 // Dark Scheme
diff --git a/app/assets/sass/modules-interface/_main.scss b/app/assets/sass/modules-interface/_main.scss
index 54f2866..629106d 100644
--- a/app/assets/sass/modules-interface/_main.scss
+++ b/app/assets/sass/modules-interface/_main.scss
@@ -17,7 +17,7 @@
     }
 
     .color-scheme--light & {
-        background:$_color_omega;
+        background:$_color_light_beta;
     }
 
     table {width:100%;}
@@ -66,7 +66,7 @@
             }
 
             .color-scheme--light & {
-                border-top-color:$_color_light_delta;
+                border-top-color:$_color_light_beta;
             }
         }
 
diff --git a/app/assets/sass/modules-objects/_data-table.scss b/app/assets/sass/modules-objects/_data-table.scss
index bc84635..22e0a8a 100644
--- a/app/assets/sass/modules-objects/_data-table.scss
+++ b/app/assets/sass/modules-objects/_data-table.scss
@@ -51,7 +51,7 @@
         }
 
         .color-scheme--light & {
-            border-color:$_color_light_epsilon;
+            border-color:$_color_light_beta;
         }
     }
 
@@ -83,7 +83,7 @@
         }
 
         .color-scheme--light & {
-            border-color:$_color_light_epsilon;
+            border-color:$_color_light_beta;
         }
 
         /* &:before { */
@@ -128,8 +128,8 @@
             }
 
             .color-scheme--light & {
-                background:$_color_light_alpha;
-                border-color:$_color_light_epsilon;
+                background:$_color_light_beta;
+                border-color:$_color_light_gamma;
 
                 &.state--asc,
                 &.state--desc {background:$_color_light_alpha;}
diff --git a/app/assets/sass/modules-objects/_filters.scss b/app/assets/sass/modules-objects/_filters.scss
index 21a2814..68de297 100644
--- a/app/assets/sass/modules-objects/_filters.scss
+++ b/app/assets/sass/modules-objects/_filters.scss
@@ -13,7 +13,7 @@
 
     .color-scheme--light & {
         background:$_color_light_gamma;
-        border-color:$_color_light_epsilon;
+        border-color:$_color_light_beta;
     }
 }
 
@@ -49,7 +49,7 @@
     }
 
     .color-scheme--light & {
-        border-color:$_color_light_epsilon;
+        border-color:$_color_light_beta;
     }
 
     .filters__item--more &,
@@ -80,7 +80,7 @@
         }
 
         .color-scheme--light & {
-            background:$_color_light_epsilon;
+            background:$_color_light_beta;
             color:$_color_alpha;
         }
     }
diff --git a/app/assets/sass/modules-objects/_panes.scss b/app/assets/sass/modules-objects/_panes.scss
index 031efb3..68715e4 100644
--- a/app/assets/sass/modules-objects/_panes.scss
+++ b/app/assets/sass/modules-objects/_panes.scss
@@ -21,7 +21,7 @@
     }
 
     .color-scheme--light & {
-        background:$_color_light_alpha;
+        background:$_color_light_gamma;
     }
 }
 
diff --git a/app/assets/sass/settings/_variables.scss b/app/assets/sass/settings/_variables.scss
index 79118c4..bb1be2f 100644
--- a/app/assets/sass/settings/_variables.scss
+++ b/app/assets/sass/settings/_variables.scss
@@ -9,13 +9,12 @@ $_img_path: "../images/" !default;
 // Colors
 //----------------------------------*/
 // Light scheme
-$_color_light_alpha: #EEEEEE !default;
-$_color_light_beta: #F9F9F9 !default;
+$_color_light_alpha: #C6D1D2 !default;
+$_color_light_beta: #ECF0F1 !default;
 $_color_light_gamma: #FFFFFF !default;
-$_color_light_delta: #333333 !default;
+$_color_light_delta: #71777C !default;
 $_color_light_epsilon: #c0c1c2 !default;
 
-
 // Dark scheme
 $_color_dark_alpha: #252C35 !default;
 $_color_dark_beta: #353D48 !default;
@@ -31,10 +30,10 @@ $_color_schemes: (
     ),
 
     light: (
-        alpha: #252C35,
-        beta: #353D48,
-        gamma: #49515C,
-        delta: #A2AAB4
+        alpha: #C6D1D2,
+        beta: #ECF0F1,
+        gamma: #FFFFFF,
+        delta: #71777C
     )
 );
 
diff --git a/app/assets/sass/temporary.scss b/app/assets/sass/temporary.scss
index 2f45f07..40bf178 100644
--- a/app/assets/sass/temporary.scss
+++ b/app/assets/sass/temporary.scss
@@ -71,11 +71,11 @@ md-checkbox.md-checked .md-icon:after {
 .subcomponent__live {
 
     .color-scheme--dark & {
-        background-color:$_color_dark_alpha;
+        background-color:$_color_dark_beta;
     }
 
     .color-scheme--light & {
-        background-color:$_color_light_alpha;
+        background-color:$_color_light_beta;
     }
 
     padding: 0px 15px;
diff --git a/app/components/sidebar/_sidebar.scss b/app/components/sidebar/_sidebar.scss
index 7634b5c..a6461e0 100644
--- a/app/components/sidebar/_sidebar.scss
+++ b/app/components/sidebar/_sidebar.scss
@@ -28,7 +28,7 @@
 
     .color-scheme--light & {
         background:$_color_light_beta;
-        color:$_color_alpha;
+        color:$_color_dark_alpha;
     }
 
     .no-js & {display:none;}
@@ -65,7 +65,7 @@
     }
 
     .color-scheme--light & {
-        color:$_color_light_epsilon;
+        color:$_color_light_gamma;
     }
 }
 
@@ -81,7 +81,7 @@
     }
 
     .color-scheme--light & {
-        border-top-color:$_color_light_epsilon;
+        border-top-color:$_color_light_gamma;
     }
 
     &:first-child {border:0;}
@@ -108,7 +108,7 @@
     }
 
     .color-scheme--light & {
-        color:$_color_light_epsilon;
+        color:$_color_light_gamma
     }
 
     .sidebar__item:first-child & {padding-top:0;}
@@ -135,7 +135,7 @@
     }
 
     .color-scheme--light & {
-        color:$_color_light_epsilon;
+        color:$_color_light_gamma;
     }
 
     &:focus,
@@ -144,7 +144,7 @@
             color:$_color_omega;
         }
         .color-scheme--light & {
-            color:$_color_alpha;
+            color:$_color_dark_alpha;
         }
     }
 
@@ -170,7 +170,7 @@
             color:$_color_omega;
         }
         .color-scheme--light & {
-            color:$_color_alpha;
+            color:$_color_dark_alpha;
         }
 
         position:relative;
@@ -204,12 +204,18 @@
     }
 
     .color-scheme--light & {
-        background:$_color_light_epsilon;
+        background:$_color_light_beta;
     }
 
     .sidebar__profile__toggle {
         @extend %typo-more-info--little;
-        color:$_color_omega;
+        .color-scheme--dark & {
+            color:$_color_omega;
+        }
+
+        .color-scheme--light & {
+            color:$_color_dark_alpha;
+        }
         display:block;
         line-height:72px;
         min-height:72px;
@@ -229,7 +235,7 @@
             }
 
             .color-scheme--light & {
-                color:$_color_alpha;
+                color:$_color_dark_alpha;
             }
         }
     }
@@ -275,7 +281,7 @@
             }
 
             .color-scheme--light & {
-                color:$_color_light_delta;
+                color:$_color_light_alpha;
             }
         }
 
diff --git a/app/components/topbar/_topbar.scss b/app/components/topbar/_topbar.scss
index 9952cbc..3b99f54 100644
--- a/app/components/topbar/_topbar.scss
+++ b/app/components/topbar/_topbar.scss
@@ -13,6 +13,7 @@
 
 .topbar__item {
     @extend %colorBorderThin;
+    height:80px;
     border:0 solid;
     display:inline-block;
     position:relative;
@@ -70,7 +71,7 @@
         }
 
         .color-scheme--light & {
-            color:$_color_alpha;
+            color:$_color_dark_alpha;
         }
 
     }