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/plot/res/templates/plot.html
View File

@@ -9,7 +9,7 @@
<span
class='plot-legend-item'
ng-repeat="telemetryObject in subplot.getTelemetryObjects()"
ng-class="{ 's-limit-upr s-limit-red': $index < 1, 's-stale': $index%2==0 }"
ng-class="{ 's-limit-upr-red': $index < 1, 's-stale': $index%2==0 }"
>
<span class='plot-color-swatch'
ng-style="{ 'background-color': plot.getColor($index) }">