Skip to content

Commit 0a0bc55

Browse files
committed
[Frontend] Styling for Time Conductor v2
Fixes #993 In-progress; mode menu names and descriptors modified, markup cleaned up
1 parent cf83040 commit 0a0bc55

File tree

4 files changed

+13
-32
lines changed

4 files changed

+13
-32
lines changed

platform/commonUI/general/res/sass/controls/_time-controller.scss

+3-20
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,14 @@
4242
&.start-date {
4343
@include background-image(linear-gradient(90deg, $colorBodyBg $inputW + $interiorMargin, transparent 100%));
4444
}
45-
4645
&.end-date {
4746
@include background-image(linear-gradient(270deg, $colorBodyBg $inputW + $interiorMargin, transparent 100%));
4847
right: 0;
4948
text-align: right;
5049
}
51-
5250
input[type="text"] {
5351
width: $inputW;
5452
}
55-
5653
.icon-calendar {
5754
position: absolute;
5855
margin-left: -16px;
@@ -70,44 +67,30 @@
7067
position: relative;
7168
width: 100%;
7269
}
73-
7470
.l-axis-holder {
7571
height: $r1H;
7672
position: relative;
7773
width: 100%;
7874
svg {
7975
stroke: $c;
8076
width: 100%; height: 100%;
77+
> g {
78+
font-size: 0.8em;
79+
}
8180
path {display: none;}
8281
line {stroke: $c;}
8382
}
8483
}
8584
}
86-
8785
.l-data-visualization {
8886
background: rgba($colorTick, 0.3);
8987
height: $r2H;
9088
}
91-
9289
.l-time-domain-selector {
9390
position: absolute;
9491
right: 0px;
9592
top: $interiorMargin;
9693
}
97-
98-
/* .super-menu.mode-selector-menu {
99-
height: 200px; width: 400px;
100-
.menu-item-description {
101-
.desc-area.icon {
102-
@include test();
103-
$h: 50px;
104-
//font-size: 3em;
105-
//height: $h;
106-
//line-height: $h;
107-
}
108-
}
109-
}*/
110-
11194
}
11295

11396
.s-time-range-val {

platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,42 @@
2626
<a
2727
ng-mouseover="representation.activeMetadata = {
2828
glyph: '\ue604',
29-
name: 'Fixed Time-Span',
30-
description: 'Display data that falls between two fixed dates'
29+
name: 'Fixed Timespan Mode',
30+
description: 'Query and explore data that falls between two fixed dates.'
3131
}"
3232
ng-mouseleave="representation.activeMetadata = undefined">
3333
<span class="ui-symbol icon type-icon">
3434
&#xe604;
3535
</span>
36-
Fixed Time-span
36+
Fixed Timespan Mode
3737
</a>
3838
</li>
3939
<li ng-click="representation.mode='realtime'">
4040
<a
4141
ng-mouseover="representation.activeMetadata = {
4242
glyph: '\u0043',
4343
name: 'Real-time Mode',
44-
description: 'Monitor real-time streaming data as it comes in to the application. The Time Conductor will automatically advance itself based on a UTC clock.'
44+
description: 'Monitor real-time streaming data as it comes in. The Time Conductor will automatically advance itself based on a UTC clock.'
4545
}"
4646
ng-mouseleave="representation.activeMetadata = undefined">
4747
<span class="ui-symbol icon type-icon">
4848
&#x43;
4949
</span>
50-
Real-time
50+
Real-time Mode
5151
</a>
5252
</li>
5353
<li ng-click="representation.mode='latest'">
5454
<a
5555
ng-mouseover="representation.activeMetadata = {
5656
glyph: '\u0044',
57-
name: 'Latest Available Data',
58-
description: 'Monitor real-time streaming data as it comes in to the application. In contrast to real-time mode the time conductor will only advance when data becomes available.'
57+
name: 'Latest Available Data Mode',
58+
description: 'Monitor real-time streaming data as it comes in. The Time Conductor will only advance when data becomes available.'
5959
}"
6060
ng-mouseleave="representation.activeMetadata = undefined">
6161
<span class="ui-symbol icon type-icon">
6262
&#x44;
6363
</span>
64-
Latest Available Data
64+
Latest Available Data Mode
6565
</a>
6666
</li>
6767
</ul>

platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<span ng-controller="ClickAwayController as modeController">
3939
<div class="s-menu-btn"
4040
ng-click="modeController.toggle()">
41-
<span class="title-label">Fixed Time Span</span>
41+
<span class="title-label">Historical Data Mode</span>
4242
</div>
4343
<div class="menu super-menu mini mode-selector-menu"
4444
ng-show="modeController.isActive()">

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<!-- Parent holder for time conductor. follow-mode | fixed-mode -->
22
<div class="l-time-conductor follow-mode"
33
ng-controller="TimeConductorController as tcController" class="l-flex-col">
4-
<!-- Holds date selectors and ticks -->
5-
6-
<!-- Holds ticks -->
4+
<!-- Holds inputs and ticks -->
75
<div class="l-time-conductor-ticks l-row-elem l-flex-row flex-elem no-margin">
86
<form class="abs l-time-conductor-inputs-holder"
97
ng-submit="tcController.updateBoundsFromForm(formModel)">

0 commit comments

Comments
 (0)