Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 98e67f8

Browse files
committedSep 15, 2016
[Frontend] Styling for TC's TOI element
Fixes #933 Fixes #1193 WIP: adjust spacing; added pagination buttons
1 parent f912b9e commit 98e67f8

File tree

3 files changed

+42
-16
lines changed

3 files changed

+42
-16
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$ueTimeConductorH: (25px, 16px, 20px); // Heights for Ticks, Data Visualization, Controls elements
22
$ueTimeConductorRtH: (25px, 3px, 20px); // Heights for elements in Real-time mode
33
$timeCondInputTimeSysDefW: 165px; // Default width for datetime value inputs
4-
$timeCondInputDeltaDefW: 60px; // Default width for delta value inputs, typically 00:00:00
4+
$timeCondInputDeltaDefW: 60px; // Default width for delta value inputs, typically 00:00:00
5+
$timeCondAxisLROffset: (5px, 5px); // Margin to left, right of tick axis and vis bar. For paging, use 15, 20px

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

+31-10
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,9 @@
185185
}
186186
.l-axis-holder {
187187
height: $r1H;
188-
position: relative;
189-
width: 100%;
188+
position: absolute;
189+
left: nth($timeCondAxisLROffset,1);
190+
right: nth($timeCondAxisLROffset,2);
190191
svg {
191192
text-rendering: geometricPrecision;
192193
width: 100%;
@@ -209,9 +210,34 @@
209210
}
210211
}
211212
}
212-
.l-data-visualization {
213-
background: $colorTimeCondDataVisBg;
213+
.l-data-visualization-holder {
214214
height: $r2H;
215+
216+
.l-page-button,
217+
.l-data-visualization {
218+
position: absolute;
219+
top: 0; bottom: 0;
220+
}
221+
222+
.l-page-button {
223+
@if nth($timeCondAxisLROffset, 1) + nth($timeCondAxisLROffset, 2) > 30 {
224+
left: 0;
225+
width: nth($timeCondAxisLROffset,1);
226+
&.align-right {
227+
left: auto; right: 0;
228+
width: nth($timeCondAxisLROffset,2);
229+
}
230+
} @else {
231+
// Hide these if the offsets aren't enough
232+
display: none;
233+
}
234+
}
235+
236+
.l-data-visualization {
237+
background: $colorTimeCondDataVisBg;
238+
left: nth($timeCondAxisLROffset, 1);
239+
right: nth($timeCondAxisLROffset, 2);
240+
}
215241
}
216242

217243
// Time of Interest control
@@ -228,7 +254,6 @@
228254
$cHov: $colorClickIconHov;
229255
$linesVOffset: 2px;
230256
@include transform(translateX(-50%));
231-
@include test(green);
232257
top: 0px; bottom: 0px;
233258
width: $r2H;
234259
left: auto; right: auto;
@@ -343,13 +368,9 @@
343368
}
344369
}
345370

346-
.l-toi-holder {
347-
display: none;
348-
}
349-
350371
.l-data-visualization {
351372
background: $colorTimeCondDataVisRtBg !important;
352-
height: $r2HRt;
373+
//height: $r2HRt;
353374
}
354375

355376
.mode-selector .s-menu-button {

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,16 @@
7878
<mct-conductor-axis></mct-conductor-axis>
7979
</div>
8080

81-
<!-- Holds data availability, time of interest -->
82-
<div class="l-data-visualization l-row-elem flex-elem">
83-
<div class="l-toi-holder slidable horz"
84-
style="left: 100%">
85-
<div class="l-toi s-toi"></div>
81+
<!-- Holds data visualization, time of interest -->
82+
<div class="l-data-visualization-holder l-row-elem flex-elem">
83+
<a class="l-page-button s-icon-button icon-pointer-left"></a>
84+
<div class="l-data-visualization">
85+
<div class="l-toi-holder slidable horz"
86+
style="left: 100%">
87+
<div class="l-toi s-toi"></div>
88+
</div>
8689
</div>
90+
<a class="l-page-button align-right s-icon-button icon-pointer-right"></a>
8791
</div>
8892

8993
<!-- Holds time system and session selectors, and zoom control -->

0 commit comments

Comments
 (0)
Please sign in to comment.