ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-11 06:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Styling and content on Follow indicator

Browse Source 
Fixes #1688
This commit is contained in:
Charles Hacskaylo 2017-09-20 10:36:56 -07:00
parent cff85fbbde
commit 883d1feb32
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/commonUI/general/res/sass/_status.scss
View File

@ -50,7 +50,6 @@
content:''; content:'';
font-family: symbolsfont; font-family: symbolsfont;
font-size: 0.8em; font-size: 0.8em;
display: inline;
margin-right: $interiorMarginSm; margin-right: $interiorMarginSm;
} }
} }

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

@ -120,7 +120,11 @@
} }
.status-indicator { .status-indicator {
background: none !important;
margin-right: $interiorMarginSm; margin-right: $interiorMarginSm;
&[class*='s-status']:before {
font-size: 1em;
}
} }
.count { .count {

7
platform/features/clock/src/indicators/FollowIndicator.js
View File

@ -23,7 +23,7 @@
define( define(
['moment'], ['moment'],
function (moment) { function (moment) {
var NO_TIMER = "No timer being followed."; var NO_TIMER = "No timer being followed";
/** /**
* Indicator that displays the active timer, as well as its * Indicator that displays the active timer, as well as its
@ -40,12 +40,11 @@ define(
}; };
FollowIndicator.prototype.getCssClass = function () { FollowIndicator.prototype.getCssClass = function () {
return "icon-clock"; return (this.timerService.getTimer()) ? "icon-timer s-status-ok" : "icon-timer";
}; };
FollowIndicator.prototype.getText = function () { FollowIndicator.prototype.getText = function () {
var timer = this.timerService.getTimer(); return (this.timerService.getTimer()) ? 'Following timer ' + timer.getModel().name : NO_TIMER;
return timer ? timer.getModel().name : NO_TIMER;
}; };
FollowIndicator.prototype.getDescription = function () { FollowIndicator.prototype.getDescription = function () {