mirror of
https://github.com/nasa/openmct.git
synced 2024-12-30 01:48:51 +00:00
Merge remote-tracking branch 'nasa/open1223' into open1223
Conflicts: platform/features/plot/res/templates/plot.html
This commit is contained in:
commit
4bc41e8aab
@ -77,8 +77,8 @@
|
|||||||
|
|
||||||
<!-- Out-of-bounds data indicators -->
|
<!-- Out-of-bounds data indicators -->
|
||||||
<!-- ng-show is temporarily hard-coded in next element -->
|
<!-- ng-show is temporarily hard-coded in next element -->
|
||||||
<div ng-show="1" class="l-oob-data l-oob-data-up"></div>
|
<div ng-show="false" class="l-oob-data l-oob-data-up"></div>
|
||||||
<div ng-show="1" class="l-oob-data l-oob-data-dwn"></div>
|
<div ng-show="false" class="l-oob-data l-oob-data-dwn"></div>
|
||||||
|
|
||||||
<div class="gl-plot-hash hash-v"
|
<div class="gl-plot-hash hash-v"
|
||||||
ng-repeat="tick in subplot.getDomainTicks()"
|
ng-repeat="tick in subplot.getDomainTicks()"
|
||||||
|
Loading…
Reference in New Issue
Block a user