[Frontend] Fixed clock indicator

Fixes #1047 Restored no-collapse and float-right properties;
nasa · Jul 26, 2016 · ce7591f · ce7591f
1 parent 5324c8e
commit ce7591f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss
@@ -62,6 +62,12 @@
     }
 }
 
+.subdued {
+    .status-indicator {
+        color: pullForward($colorStatusBarBg, 40%);
+    }
+}
+
 .status-block-holder {
     // Applied to mct-include element
     // Contains status.block elements

diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -82,7 +82,7 @@
         top: auto;
         height: $ueFooterH;
         line-height: $ueFooterH - ($interiorMargin * 2);
-        background: $colorFooterBg;
+        background: $colorStatusBarBg;
         color: lighten($colorBodyBg, 30%);
         font-size: .7rem;
         .status-holder {

diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss
@@ -2,7 +2,7 @@
 $colorBodyBg: #333;
 $colorBodyFg: #999;
 $colorGenBg: #222;
-$colorFooterBg: #000;
+$colorStatusBarBg: #000;
 $colorKey: #0099cc;
 $colorKeySelectedBg: #005177;
 $colorKeyFg: #fff;
@@ -29,6 +29,7 @@ $colorBtnMajorBg: $colorKey;
 $colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent);
 $colorBtnMajorFg: $colorKeyFg;
 $colorBtnMajorFgHov: pullForward($colorBtnMajorFg, $hoverRatioPercent);
+// TODO: make clickable icon initially use the key color; also, introduce a toggle-able icon with different color approach
 $colorClickIcon: $colorBodyFg;
 $colorClickIconActive: $colorKey;
 $colorClickIconHov: $colorClickIconActive;

diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss
@@ -2,7 +2,7 @@
 $colorBodyBg: #fcfcfc;
 $colorBodyFg: #666;
 $colorGenBg: #fff;
-$colorFooterBg: #000;
+$colorStatusBarBg: #000;
 $colorKey: #0099cc;
 $colorKeySelectedBg: $colorKey;
 $colorKeyFg: #fff;

diff --git a/platform/features/clock/src/indicators/ClockIndicator.js b/platform/features/clock/src/indicators/ClockIndicator.js
@@ -44,6 +44,10 @@ define(
             });
         }
 
+        ClockIndicator.prototype.getGlyphClass = function () {
+            return "no-collapse float-right subdued";
+        };
+
         ClockIndicator.prototype.getCssClass = function () {
             return "icon-clock";
         };