From 729d91e7f36f67b7a3c8eda4bb973b068e5df0ae Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 22 Feb 2016 12:51:32 -0800 Subject: [PATCH] [Frontend] CSS sanding and shimming open #442 Fixed white space problem with .status-block-holder applied to mct-include; Added new status 'available' class and updated theme constants files; --- .../commonUI/general/res/sass/controls/_messages.scss | 9 +++++++++ platform/commonUI/general/res/templates/bottombar.html | 3 ++- .../commonUI/themes/espresso/res/sass/_constants.scss | 1 + platform/commonUI/themes/snow/res/sass/_constants.scss | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index bdd9b7270a..187bdcdcfe 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -36,6 +36,12 @@ } } +mct-include.status-block-holder { + // mct-include that wraps status.block + // Must use display: inline-block to fix white space problems + display: inline-block; +} + .status.block { $transDelay: 1.5s; $transSpeed: .25s; @@ -98,6 +104,9 @@ &.error .status-indicator { color: $colorStatusError; } + &.available .status-indicator { + color: $colorStatusAvailable; + } .count { @include trans-prop-nice(opacity, $transSpeed, $transDelay); font-weight: bold; diff --git a/platform/commonUI/general/res/templates/bottombar.html b/platform/commonUI/general/res/templates/bottombar.html index f0d3799542..1883d31dd5 100644 --- a/platform/commonUI/general/res/templates/bottombar.html +++ b/platform/commonUI/general/res/templates/bottombar.html @@ -23,7 +23,8 @@
+ key="indicator.template" + class="status-block-holder">
diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 4511a83338..6b6ded1a7f 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -91,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #62ba72; $colorStatusAlert: #ffa66d; $colorStatusError: #d4585c; +$colorStatusAvailable: $colorKey; $colorStatusBtnBg: $colorBtnBg; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: $colorKey; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index b849d6c9e0..c82bfca233 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -91,6 +91,7 @@ $colorStatusDefault: #ccc; $colorStatusInfo: #60ba7b; $colorStatusAlert: #ffb66c; $colorStatusError: #c96b68; +$colorStatusAvailable: $colorKey; $colorStatusBtnBg: #666; $colorProgressBarOuter: rgba(#000, 0.1); $colorProgressBarAmt: #0a0;