Skip to content

Commit bb2ae2f

Browse files
committed
[Frontend] Styling for TOI element
Fixes #933 Fixes #1193 Finalized TOI in plots, table and TC
1 parent 0cf4c92 commit bb2ae2f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

platform/commonUI/general/res/sass/controls/_time-of-interest.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ table {
8383
.gl-plot {
8484
.gl-plot-wrapper-display-area-and-x-axis {
8585
&:hover {
86-
.l-toi-holder:not(.active) {
86+
.l-toi-holder.hover {
8787
opacity: 1;
8888
}
8989
}

platform/features/conductor-v2/conductor/res/sass/_time-conductor-base.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@
247247
// Hide the cursor, because the TOI element essentially "becomes" the cursor
248248
// when the user is hovering over the visualization area.
249249
cursor: none;
250-
.l-toi-holder {
250+
.l-toi-holder.hover {
251251
opacity: 1;
252252
}
253-
.l-toi-holder.pinned {
253+
.l-toi-holder.pinned.active {
254254
opacity: 0.4;
255255
.l-toi-val {
256256
pointer-events: none;
@@ -341,7 +341,7 @@
341341
}
342342

343343
&.pinned {
344-
opacity: 1;
344+
//opacity: 1;
345345
z-index: 2; // Get this above a non-pinned instance so user can access the remove "x" button.
346346
&.active {
347347
opacity: 1;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,14 @@
103103
- The pinned TOI must precede the non-pinned version in markup,
104104
so that we can hide the non-pinned TOI when hovering over the pinned one.
105105
-->
106-
<div class="l-toi-holder horz pinned"
107-
ng-show="true"
106+
<div class="l-toi-holder pinned"
108107
ng-class="{ 'active': false, 'val-to-right': true }"
109108
ng-click="this.active = false"
110109
style="left: 5%">
111110
<div class="l-toi s-toi"></div>
112111
<div class="l-toi-val">2016-09-15 21:31:30.000Z</div>
113112
</div>
114-
<div class="l-toi-holder horz"
113+
<div class="l-toi-holder hover"
115114
ng-class="{ 'val-to-right': false }"
116115
style="left: 75%">
117116
<div class="l-toi s-toi"></div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<a class="s-icon-button icon-x-in-circle t-unpin-button flex-elem"></a>
8888
</div>
8989
</div>
90-
<div class="l-toi-holder"
90+
<div class="l-toi-holder hover"
9191
style="left: 20%">
9292
<!-- Need text val at bottom, plus vertical line -->
9393
<div class="l-toi-val l-flex-row">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
</thead>
5151
<tbody>
5252
<tr ng-repeat="visibleRow in visibleRows track by visibleRow.rowIndex"
53+
ng-class="{ 'l-toi active pinned': false }"
5354
ng-style="{
5455
top: visibleRow.offsetY + 'px',
5556
}">

0 commit comments

Comments
 (0)