[Frontend] Fixing issues with theme coloring

Fixes #933
nasa · Aug 2, 2016 · ca5206d · ca5206d
1 parent 573f1f9
commit ca5206d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 16 deletions.
diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss
@@ -268,16 +268,6 @@
     text-shadow: rgba(black, $sVal) 0 3px 7px;
 }
 
-@function pullForward($c, $p: 20%) {
-    // For dark interfaces, lighter things come forward
-    @return lighten($c, $p);
-}
-
-@function pushBack($c, $p: 20%) {
-    // For dark interfaces, darker things move back
-    @return darken($c, $p);
-}
-
 @function percentToDecimal($p) {
 	@return $p / 100%;
 }

diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss
@@ -61,7 +61,7 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#fff, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: pullForward($colorObjHdrTxt, 20%);
+$colorObjHdrIc: darken($colorObjHdrTxt, 20%);
 $colorTick: pullForward($colorBodyBg, 20%);
 
 // Menu colors

diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss
@@ -61,8 +61,8 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#000, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: pushBack($colorObjHdrTxt, 30%);
-$colorTick: pullForward($colorBodyBg, 30%);
+$colorObjHdrIc: lighten($colorObjHdrTxt, 20%);
+$colorTick: lighten($colorBodyFg, 10%);
 
 // Menu colors
 $colorMenuBg: pushBack($colorBodyBg, 10%);

diff --git a/platform/features/conductor-v2/res/sass/_time-conductor-base.scss b/platform/features/conductor-v2/res/sass/_time-conductor-base.scss
@@ -66,7 +66,7 @@
         top: 50%;
         z-index: 2;
         &:before {
-            background-color: $c;
+            background: $colorObjHdrIc;
             content: '';
             display: block;
             position: absolute;
@@ -77,7 +77,6 @@
             z-index: 2;
             @include animation-duration(12s);
             &:before {
-                //background: red;
                 height: ceil($handH * 0.7);
             }
         }
@@ -178,7 +177,7 @@
     }
 
     .l-time-conductor-inputs-and-ticks {
-        $c: $colorTick;
+        $c: $colorTimeCondTicks; //$colorTick;
         height: $r1H;
         mct-conductor-axis {
             display: block;

diff --git a/platform/features/conductor-v2/res/sass/time-conductor-espresso.scss b/platform/features/conductor-v2/res/sass/time-conductor-espresso.scss
@@ -31,6 +31,7 @@
 @import "constants";
 
 // Thematic constants
+$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
 $colorTimeCondKeyBg: #4e70dc;
 $colorTimeCondKeyFg: #fff;
 $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);

diff --git a/platform/features/conductor-v2/res/sass/time-conductor-snow.scss b/platform/features/conductor-v2/res/sass/time-conductor-snow.scss
@@ -31,6 +31,7 @@
 @import "constants";
 
 // Thematic constants
+$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
 $colorTimeCondKeyBg: #6178dc;
 $colorTimeCondKeyFg: #fff;
 $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);