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

[Frontend] Themes final on open prior to VISTA integration

Browse Source 
open #95
Branch open95b now replaces open95;
Fix to status indicator to only
display when title length > 0;
This commit is contained in:
Charles Hacskaylo 2015-09-16 10:45:22 -07:00
parent a3a6706869
commit 4f5a1115d2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@
.status.block { .status.block {
//display: inline-block; //display: inline-block;
display: inline; // New status bar design. Inline to support ellipsis overflow display: inline; // New status bar design. Inline to support ellipsis overflow
margin-right: $interiorMargin * 2; margin-right: $interiorMarginLg;
.status-indicator { .status-indicator {
//@include border-radius($controlCr * 0.9); //@include border-radius($controlCr * 0.9);
//@include box-shadow(inset rgba(black, 0.5) 0 0 3px); //@include box-shadow(inset rgba(black, 0.5) 0 0 3px);

13
platform/commonUI/general/res/templates/indicator.html
View File

@ -22,7 +22,8 @@
<div class='status block' <div class='status block'
title="{{ngModel.getDescription()}}" title="{{ngModel.getDescription()}}"
ng-click='ngModel.configure()' ng-click='ngModel.configure()'
ng-class='ngModel.getClass()'> ng-class='ngModel.getClass()'
ng-show="ngModel.getText().length > 0">
<span class="ui-symbol status-indicator" <span class="ui-symbol status-indicator"
ng-class='ngModel.getGlyphClass()'> ng-class='ngModel.getGlyphClass()'>
{{ngModel.getGlyph()}} {{ngModel.getGlyph()}}
@ -31,9 +32,9 @@
ng-class='ngModel.getTextClass()'> ng-class='ngModel.getTextClass()'>
{{ngModel.getText()}} {{ngModel.getText()}}
</span> </span>
<a href='' <a href=''
class="ui-symbol" class="ui-symbol"
ng-if="ngModel.configure"> ng-if="ngModel.configure">
G G
</a> </a>
</div> </div>