Skip to content

Commit 2256447

Browse files
akhenryakhenry
committed
Merge branch 'open1193' of https://github.com/nasa/openmctweb into open1193
2 parents 9f3ec3b + 86b51f6 commit 2256447

File tree

5 files changed

+57
-55
lines changed

5 files changed

+57
-55
lines changed

‎platform/features/conductor-v2/conductor/res/sass/_time-of-interest.scss

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* at runtime from the About dialog for additional information.
2121
*****************************************************************************/
2222

23-
.l-toi-holder,
23+
mct-include.l-toi-holder,
2424
.l-toi-holder:after,
2525
.l-toi-holder:before {
2626
display: block;
2727
position: absolute;
2828
}
2929

30-
.l-toi-holder {
30+
mct-include.l-toi-holder {
3131
$blockerFadeW: $toiBlockerFadeW;
3232
@include transform(translateX(-50%));
3333
color: $toiColorBg;
@@ -36,12 +36,11 @@
3636
bottom: 0;
3737
width: $toiH;
3838
&:not(.pinned) {
39-
opacity: 0;
40-
pointer-events: none;
39+
display: none;
4140
}
4241

4342
&.pinned {
44-
opacity: 1;
43+
display: block;
4544
}
4645

4746
&:before,
@@ -138,61 +137,62 @@
138137
.l-toi-val {
139138
display: none; // Hide by default; see .show-val below
140139
}
141-
}
142-
143-
// TOI is showing value as well
144-
.show-val .l-toi-holder {
145-
.l-toi {
146-
.l-toi-buttons {
147-
order: 1;
148-
&:hover {
149-
margin-right: $interiorMarginSm;
150-
}
151-
}
152-
.l-toi-val {
153-
@include trans-prop-nice($props: opacity, $dur: 150ms);
154-
background-color: $toiColorBg;
155-
border-radius: $controlCr;
156-
box-sizing: content-box;
157-
color: $toiColorFg;
158-
display: inline-block;
159-
font-size: 0.7rem;
160-
font-weight: 400;
161-
height: $toiH;
162-
line-height: $toiH;
163-
order: 2;
164-
padding: 1px 3px;
165-
white-space: nowrap;
166-
}
167-
}
168140

169-
&.val-to-left {
141+
// TOI is showing value as well
142+
&.show-val {
170143
.l-toi {
171-
left: auto;
172-
right: $toiPad * -2;
173-
174144
.l-toi-buttons {
175-
order: 2;
145+
order: 1;
176146
&:hover {
177-
.t-button-resync { order: 2; }
178-
.t-button-unpin { order: 1; }
179-
margin-left: $interiorMarginSm;
147+
margin-right: $interiorMarginSm;
180148
}
181149
}
182-
183150
.l-toi-val {
184-
order: 1;
151+
@include trans-prop-nice($props: opacity, $dur: 150ms);
152+
background-color: $toiColorBg;
153+
border-radius: $controlCr;
154+
box-sizing: content-box;
155+
color: $toiColorFg;
156+
display: inline-block;
157+
font-size: 0.7rem;
158+
font-weight: 400;
159+
height: $toiH;
160+
line-height: $toiH;
161+
order: 2;
162+
padding: 1px 3px;
163+
white-space: nowrap;
164+
}
165+
}
166+
167+
&.val-to-left {
168+
.l-toi {
169+
left: auto;
170+
right: $toiPad * -2;
171+
172+
.l-toi-buttons {
173+
order: 2;
174+
&:hover {
175+
.t-button-resync { order: 2; }
176+
.t-button-unpin { order: 1; }
177+
margin-left: $interiorMarginSm;
178+
}
179+
}
180+
181+
.l-toi-val {
182+
order: 1;
183+
}
185184
}
186185
}
187186
}
188187
}
189188

189+
190190
// TOI in tables
191191
.tabular,
192192
table {
193193
tbody, .tbody {
194194
tr, .tr {
195-
&.l-toi-tablerow.pinned {
195+
&.l-toi-tablerow {
196196
border-top: 1px dashed $toiColorBg;
197197
z-index: 1;
198198
td, .td {

‎platform/features/conductor-v2/conductor/res/templates/time-conductor.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,10 @@
8989
ng-click="toi.click($event)">
9090
<a class="l-page-button s-icon-button icon-pointer-left"></a>
9191
<div class="l-data-visualization">
92-
<div style="position: relative; height: 100%" ng-style="{'left': toi.left + '%'}">
93-
<mct-include key="'time-of-interest'" class="show-val"></mct-include>
94-
</div>
92+
<mct-include key="'time-of-interest'"
93+
class="l-toi-holder show-val"
94+
ng-class="{ pinned: pinned, 'val-to-left': toi.left > 80 }"
95+
ng-style="{'left': toi.left + '%'}"></mct-include>
9596
</div>
9697
<a class="l-page-button align-right s-icon-button icon-pointer-right"></a>
9798
</div>

‎platform/features/conductor-v2/conductor/res/templates/time-of-interest.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<div class="l-toi-holder"
2-
ng-controller="TimeOfInterestController as toi"
3-
ng-class="{ 'pinned': pinned, 'val-to-left': toi.left > 80 }">
1+
<div class="abs angular-controller"
2+
ng-controller="TimeOfInterestController as toi">
43
<div class="l-flex-row l-toi">
54
<span class="flex-elem l-flex-row l-toi-buttons">
65
<a class="flex-elem t-button-resync icon-button" title="Re-sync Time of Interest"

‎platform/features/plot/res/templates/plot.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,11 @@
7777
</div>
7878

7979
<div class="gl-plot-wrapper-display-area-and-x-axis">
80-
<div class="toiPositioner"
81-
ng-if="toiPerc" ng-style="{'left': toiPerc + '%'}">
82-
<mct-include key="'time-of-interest'" class="show-val"></mct-include>
83-
</div>
80+
<mct-include key="'time-of-interest'"
81+
class="l-toi-holder show-val"
82+
ng-if="toiPerc"
83+
ng-class="{ 'val-to-left': toiPerc > 80 }"
84+
ng-style="{'left': toiPerc + '%'}"></mct-include>
8485

8586
<div class="gl-plot-coords"
8687
ng-if="subplot.isHovering() && subplot.getHoverCoordinates()">

‎platform/features/table/res/templates/mct-table.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@
5252
<tr ng-repeat-start="visibleRow in visibleRows track by visibleRow.rowIndex"
5353
ng-if="visibleRow.rowIndex === toiRowIndex"
5454
ng-style="{ top: visibleRow.offsetY + 'px' }"
55-
class="l-toi-tablerow pinned">
55+
class="l-toi-tablerow">
5656
<td colspan="999">
57-
<mct-include key="'time-of-interest'"></mct-include>
57+
<mct-include key="'time-of-interest'"
58+
class="l-toi-holder pinned"></mct-include>
5859
</td>
5960
</tr>
6061
<tr ng-repeat-end

0 commit comments

Comments
 (0)