ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 21:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Fixed clock indicator

Browse Source 
Fixes #1047
Restored no-collapse and float-right
properties;
This commit is contained in:
Charles Hacskaylo 2016-07-26 11:22:23 -07:00
parent 5324c8edba
commit ce7591f642
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/general/res/sass/controls/_messages.scss
View File

@ -62,6 +62,12 @@
} }
} }
.subdued {
.status-indicator {
color: pullForward($colorStatusBarBg, 40%);
}
}
.status-block-holder { .status-block-holder {
// Applied to mct-include element // Applied to mct-include element
// Contains status.block elements // Contains status.block elements

2
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@ -82,7 +82,7 @@
top: auto; top: auto;
height: $ueFooterH; height: $ueFooterH;
line-height: $ueFooterH - ($interiorMargin * 2); line-height: $ueFooterH - ($interiorMargin * 2);
background: $colorFooterBg; background: $colorStatusBarBg;
color: lighten($colorBodyBg, 30%); color: lighten($colorBodyBg, 30%);
font-size: .7rem; font-size: .7rem;
.status-holder { .status-holder {

3
platform/commonUI/themes/espresso/res/sass/_constants.scss
View File

@ -2,7 +2,7 @@
$colorBodyBg: #333; $colorBodyBg: #333;
$colorBodyFg: #999; $colorBodyFg: #999;
$colorGenBg: #222; $colorGenBg: #222;
$colorFooterBg: #000; $colorStatusBarBg: #000;
$colorKey: #0099cc; $colorKey: #0099cc;
$colorKeySelectedBg: #005177; $colorKeySelectedBg: #005177;
$colorKeyFg: #fff; $colorKeyFg: #fff;
@ -29,6 +29,7 @@ $colorBtnMajorBg: $colorKey;
$colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent); $colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent);
$colorBtnMajorFg: $colorKeyFg; $colorBtnMajorFg: $colorKeyFg;
$colorBtnMajorFgHov: pullForward($colorBtnMajorFg, $hoverRatioPercent); $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; $colorClickIcon: $colorBodyFg;
$colorClickIconActive: $colorKey; $colorClickIconActive: $colorKey;
$colorClickIconHov: $colorClickIconActive; $colorClickIconHov: $colorClickIconActive;

2
platform/commonUI/themes/snow/res/sass/_constants.scss
View File

@ -2,7 +2,7 @@
$colorBodyBg: #fcfcfc; $colorBodyBg: #fcfcfc;
$colorBodyFg: #666; $colorBodyFg: #666;
$colorGenBg: #fff; $colorGenBg: #fff;
$colorFooterBg: #000; $colorStatusBarBg: #000;
$colorKey: #0099cc; $colorKey: #0099cc;
$colorKeySelectedBg: $colorKey; $colorKeySelectedBg: $colorKey;
$colorKeyFg: #fff; $colorKeyFg: #fff;

4
platform/features/clock/src/indicators/ClockIndicator.js
View File

@ -44,6 +44,10 @@ define(
}); });
} }
ClockIndicator.prototype.getGlyphClass = function () {
return "no-collapse float-right subdued";
};
ClockIndicator.prototype.getCssClass = function () { ClockIndicator.prototype.getCssClass = function () {
return "icon-clock"; return "icon-clock";
}; };