Skip to content

Commit da7c636

Browse files
committed
[Frontend] Time Conductor v2 styling
Fixes #933 Redo TC icon to use font symbol, added new symbol for brackets to font files; font anti-aliasing mod for .ui-symbol class; layout tweaks; mobile tweaks.
1 parent b392633 commit da7c636

File tree

7 files changed

+37
-36
lines changed

7 files changed

+37
-36
lines changed
Binary file not shown.

platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg

+1
Loading
Binary file not shown.
Binary file not shown.

platform/commonUI/general/res/sass/_icons.scss

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
.ui-symbol {
3232
font-family: 'symbolsfont';
33+
-webkit-font-smoothing: antialiased;
3334
&.type-icon {
3435
color: $colorObjHdrIc;
3536
}

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

+33-34
Original file line numberDiff line numberDiff line change
@@ -45,40 +45,27 @@
4545

4646
.time-conductor-icon {
4747
$c: $colorObjHdrIc;
48-
$d: 20px;
49-
background: $c;
50-
border-radius: 4px;
48+
$d: 18px;
5149
height: $d !important;
5250
width: $d;
5351
position: relative;
5452

55-
// Icon shape: brackets
56-
&:before,
57-
&:after {
58-
content: '';
59-
background: $colorBodyBg;
60-
position: absolute;
61-
}
6253
&:before {
63-
$in: 7px;
64-
left: $in;
65-
top: 0;
66-
right: $in;
67-
bottom: 0;
68-
69-
}
70-
&:after {
71-
$in: 4px;
72-
left: $in;
73-
top: $in;
74-
right: $in;
75-
bottom: $in;
54+
@extend .ui-symbol;
55+
color: $c;
56+
content: '\e624';
57+
font-size: $d;
58+
line-height: normal;
59+
display: block;
60+
width: 100%;
61+
height: 100%;
62+
z-index: 1;
7663
}
7764

7865
// Clock hands
7966
div[class*="hand"] {
8067
$handW: 2px;
81-
$handH: 8px;
68+
$handH: $d * 0.4; //8px;
8269
@include transform(translate(-50%, -50%));
8370
@include animation-iteration-count(infinite);
8471
@include animation-timing-function(linear);
@@ -260,15 +247,11 @@
260247
}
261248
}
262249

263-
.l-data-visualization {
264-
background: $colorTimeCondDataVisRtBg !important
265-
}
266-
267250
// Real-time, latest modes
268251
&.realtime-mode,
269252
&.latest-mode {
270253
.time-conductor-icon {
271-
background: $colorTimeCondKeyBg;
254+
&:before { color: $colorTimeCondKeyBg; }
272255
div[class*="hand"] {
273256
@include animation-name(clock-hands);
274257
&:before {
@@ -308,6 +291,10 @@
308291
}
309292
}
310293

294+
.l-data-visualization {
295+
background: $colorTimeCondDataVisRtBg !important
296+
}
297+
311298
.mode-selector .s-menu-btn {
312299
@include btnSubtle($colorTimeCondKeyBg, pullForward($colorTimeCondKeyBg, $ltGamma), $colorTimeCondKeyFg);
313300
}
@@ -383,8 +370,15 @@
383370
@include phone {
384371
.l-time-conductor {
385372
min-width: 0;
386-
.l-time-conductor-inputs-and-ticks mct-conductor-axis {
387-
display: none;
373+
.l-time-conductor-inputs-and-ticks {
374+
.l-time-conductor-inputs-holder {
375+
.l-time-range-w {
376+
background-image: none !important;
377+
}
378+
}
379+
mct-conductor-axis {
380+
display: none;
381+
}
388382
}
389383
}
390384
}
@@ -413,6 +407,14 @@
413407
&:not(:first-child) {
414408
margin-top: $interiorMargin;
415409
}
410+
}
411+
}
412+
}
413+
414+
// Fixed mode
415+
&.fixed-mode {
416+
.l-time-conductor-inputs-and-ticks {
417+
.l-time-range-w {
416418
.title {
417419
width: 30px;
418420
}
@@ -425,9 +427,6 @@
425427
&.latest-mode {
426428
.l-time-conductor-inputs-and-ticks {
427429
.l-time-range-w {
428-
.title {
429-
width: 30px;
430-
}
431430
&.start-w {
432431
display: none;
433432
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<div class="flex-elem holder grows l-flex-col l-time-conductor-inner">
1111
<!-- Holds inputs and ticks -->
12-
<div class="l-time-conductor-inputs-and-ticks l-row-elem l-flex-row flex-elem no-margin">
12+
<div class="l-time-conductor-inputs-and-ticks l-row-elem flex-elem no-margin">
1313
<form class="l-time-conductor-inputs-holder"
1414
ng-submit="tcController.updateBoundsFromForm(formModel)">
1515
<span class="l-time-range-w start-w">
@@ -80,7 +80,7 @@
8080
</div>
8181

8282
<!-- Holds data availability, time of interest -->
83-
<div class="l-data-visualization l-row-elem l-flex-row flex-elem"></div>
83+
<div class="l-data-visualization l-row-elem flex-elem"></div>
8484

8585
<!-- Holds time system and session selectors, and zoom control -->
8686
<div class="l-time-conductor-controls l-row-elem l-flex-row flex-elem">

0 commit comments

Comments
 (0)