Skip to content

Commit 1650aae

Browse files
committed
[Frontend] Styling for TOI element
Fixes #933 Fixes #1193 WIP: Tabular styling for TOI; TODO: make bottom border work
1 parent d3bf6c5 commit 1650aae

File tree

5 files changed

+24
-51
lines changed

5 files changed

+24
-51
lines changed

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -115,39 +115,39 @@ TC
115115
}
116116

117117
// TOI in tables
118-
@mixin toiIcon() {
119-
@extend .ui-symbol;
120-
@include transform(translate(-50%, -50%));
121-
content: $glyph-icon-clock;
122-
display: block;
123-
position: absolute;
124-
text-shadow: 0 1px 15px black;
125-
left: 50%;
126-
top: 0;
127-
z-index: 2;
128-
}
129-
130118
.tabular,
131119
table {
132120
tbody, .tbody {
133121
tr, .tr {
134-
&:hover {
122+
&.l-toi.pinned {
135123
td {
136124
border-top: 1px dashed $toiColorBg;
137125
&:first-child:before {
138-
@include toiIcon();
139-
color: $toiColorFg;
126+
@extend .ui-symbol;
127+
@include transform(translate(-50%, -50%));
128+
content: $glyph-icon-clock;
129+
display: block;
130+
position: absolute;
131+
text-shadow: 0 1px 15px black;
132+
left: 50%;
133+
top: 0;
134+
z-index: 2;
135+
color: $toiColorBg;
140136
}
141137
}
142-
}
143-
&.l-toi.pinned {
144-
td {
145-
border-top: 1px solid $toiColorBg;
146-
&:first-child:before {
147-
@include toiIcon();
148-
color: $toiColorFg;
138+
139+
&.highlight-bottom-edge {
140+
td {
141+
border-bottom: 1px dashed $toiColorBg;
142+
//border-top: 1px solid transparent;
143+
&:first-child:before {
144+
@include transform(translate(-50%, 50%));
145+
top: auto;
146+
bottom: 0;
147+
}
149148
}
150149
}
150+
151151
&:hover {
152152
td:first-child:before {
153153
content: $glyph-icon-x-in-circle;

platform/commonUI/themes/espresso/res/sass/_constants.scss

+1-5
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,8 @@ $colorInspectorSectionHeaderBg: $colorFormSectionHeader;
104104
$colorInspectorSectionHeaderFg: pullForward($colorInspectorBg, 40%);
105105

106106
// Time of Interest
107-
$toiColorBg: $colorBtnMajorBg;
108-
$toiColorBgHov: $colorBtnMajorBgHov;
107+
$toiColorBg: #6b93c6; //$colorBtnMajorBg;
109108
$toiColorFg: #000;
110-
$toiColorFgHov: #fff;
111-
$toiColorBgActive: lighten($colorKey, 10%);
112-
$toiColorFgActive: $toiColorFgHov;
113109
$toiW: 12px;
114110

115111
// Status colors, mainly used for messaging and item ancillary symbols

platform/commonUI/themes/snow/res/sass/_constants.scss

+1-5
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,8 @@ $colorInspectorSectionHeaderBg: pullForward($colorInspectorBg, 5%);
104104
$colorInspectorSectionHeaderFg: pullForward($colorInspectorBg, 40%);
105105

106106
// Time of Interest
107-
$toiColorBg: $colorKey;
108-
$toiColorBgHov: lighten($colorKey, 10%);
107+
$toiColorBg: #6b93c6;
109108
$toiColorFg: #fff;
110-
$toiColorFgHov: #fff;
111-
$toiColorBgActive: lighten($colorKey, 20%);
112-
$toiColorFgActive: $toiColorFgHov;
113109
$toiW: 12px;
114110

115111
// Status colors, mainly used for messaging and item ancillary symbols

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

-18
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,6 @@
263263

264264
// Time of Interest control
265265
.l-toi-holder {
266-
$c: $colorTimeCondTOIBg;
267-
$cHov: $toiColorBgHov;
268266
$linesVOffset: 2px;
269267
&:before,
270268
&:after {
@@ -291,20 +289,6 @@
291289
.l-toi {
292290
top: 50%;
293291
@include transform(translateY(-50%));
294-
//$d: $timeCondTOIIconD;
295-
//@include transform(translate(-50%, -50%));
296-
//font-size: $d;
297-
//line-height: $d;
298-
//left: 50%;
299-
//top: 50%;
300-
//height: $d;
301-
//width: $d;
302-
//z-index: 1;
303-
}
304-
305-
.l-toi-val {
306-
//@include transform(translateY(-51%));
307-
//top: 50%;
308292
}
309293
}
310294

@@ -314,13 +298,11 @@
314298
.l-time-conductor-zoom-w {
315299
@include justify-content(flex-end);
316300
.time-conductor-zoom {
317-
//display: none; // TEMP per request from Andrew 8/1/16
318301
height: $r3H;
319302
min-width: 100px;
320303
width: 20%;
321304
}
322305
.time-conductor-zoom-current-range {
323-
//display: none; // TEMP per request from Andrew 8/1/16
324306
color: $colorTick;
325307
}
326308
}

platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss

-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ $colorTimeCondKeyBg: #4e70dc;
3636
$colorTimeCondKeyFg: #fff;
3737
$colorTimeCondDataVisBg: pullForward($colorBodyBg, 5%);
3838
$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 10%);
39-
$colorTimeCondTOIBg: lighten($toiColorBg, 20%);
4039
@import "time-conductor-base";

0 commit comments

Comments
 (0)