From ce7591f64299f163635808d22181f4c42d782a82 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue, 26 Jul 2016 11:22:23 -0700
Subject: [PATCH] [Frontend] Fixed clock indicator

Fixes #1047
Restored no-collapse and float-right
properties;
---
 platform/commonUI/general/res/sass/controls/_messages.scss  | 6 ++++++
 .../commonUI/general/res/sass/user-environ/_layout.scss     | 2 +-
 platform/commonUI/themes/espresso/res/sass/_constants.scss  | 3 ++-
 platform/commonUI/themes/snow/res/sass/_constants.scss      | 2 +-
 platform/features/clock/src/indicators/ClockIndicator.js    | 4 ++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss
index 821e1c0d0c..b816b42355 100644
--- 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
index a12757fcca..2dad3d6a5a 100644
--- 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
index ba08aa0b83..72be34a97e 100644
--- 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
index 641c353941..32fd7e7e89 100644
--- 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
index 16b79a151f..35ea9448b3 100644
--- 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";
         };