alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Frontend] Merging warp1172 platform changes in

Browse Source 
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
This commit is contained in:
Charles Hacskaylo
2015-05-07 13:10:04 -07:00
parent 2d13745823
commit 58bd4240f1
10 changed files with 149 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/layout/res/templates/elements/telemetry.html
View File

@@ -16,7 +16,7 @@
<!-- ng-class is temporarily hard-coded in next element -->
<span
class="l-value-bg s-value-bg"
ng-class="{ 's-limit-lwr': ngModel.value < 0, 's-limit-red' : ngModel.value < 0 }"
ng-class="{ 's-limit-upr-yellow': ngModel.value < 0 }"
>
{{ngModel.value}}
</span>