Skip to content

Commit 1173828

Browse files
committed
[Frontend] Styling for unsynced elements
Fixes #933
1 parent ca5206d commit 1173828

File tree

4 files changed

+32
-20
lines changed

4 files changed

+32
-20
lines changed

platform/commonUI/browse/res/templates/browse/object-header.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<span class='type-icon flex-elem {{type.getCssClass()}}'></span>
2323
<span class="l-elem-wrapper l-flex-row flex-elem grows">
2424
<span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
25-
<span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
25+
<span class='title-label flex-elem holder flex-can-shrink'>{{model.name}}</span>
26+
<span class='t-object-alert t-alert-unsynced flex-elem holder' title='This object is not currently displaying real-time data'></span>
2627
<mct-representation
2728
key="'menu-arrow'"
2829
mct-object='domainObject'
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
1-
.s-unsynced {
2-
$c: $colorPausedBg;
3-
border: 1px solid $c;
4-
@include animTo($animName: pulsePaused, $propName: border-color, $propValStart: rgba($c, 0.8), $propValEnd: rgba($c, 0.5), $dur: $animPausedPulseDur, $dir: alternate, $count: infinite);
5-
}
6-
7-
81
.s-stale {
92
@include s-stale();
103
.td {
114
@include s-stale();
125
}
136
}
14-
15-
.s-status-timeconductor-unsynced {
16-
// Layout frames
17-
18-
// Plot areas
19-
.gl-plot .gl-plot-display-area {
20-
@extend .s-unsynced;
21-
}
22-
}
23-

platform/commonUI/general/res/sass/controls/_controls.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,6 @@ input[type="search"] {
295295
.title-label {
296296
color: $colorObjHdrTxt;
297297
@include ellipsize();
298-
@include webkitProp(flex, '0 1 auto');
299-
padding-right: 0.35em; // For context arrow. Done with em's so pad is relative to the scale of the text.
300298
}
301299

302300
.context-available-w {
@@ -307,6 +305,10 @@ input[type="search"] {
307305
font-size: 0.7em;
308306
@include flex(0 0 1);
309307
}
308+
309+
.t-object-alert {
310+
display: none;
311+
}
310312
}
311313

312314
/******************************************************** PROGRESS BAR */

platform/commonUI/general/res/sass/controls/_messages.scss

+26
Original file line numberDiff line numberDiff line change
@@ -345,3 +345,29 @@ body.desktop .t-message-single {
345345
body.desktop .t-message-list {
346346
.message-contents .l-message { margin-right: $interiorMarginLg; }
347347
}
348+
349+
// Alert elements in views
350+
.s-unsynced {
351+
$c: $colorPausedBg;
352+
border: 1px solid $c;
353+
@include animTo($animName: pulsePaused, $propName: border-color, $propValStart: rgba($c, 0.8), $propValEnd: rgba($c, 0.5), $dur: $animPausedPulseDur, $dir: alternate, $count: infinite);
354+
}
355+
356+
.s-status-timeconductor-unsynced {
357+
// Plot areas
358+
.gl-plot .gl-plot-display-area {
359+
@extend .s-unsynced;
360+
}
361+
362+
// Object headers
363+
.object-header {
364+
.t-object-alert {
365+
display: inline;
366+
&.t-alert-unsynced {
367+
@extend .icon-alert-triangle;
368+
color: $colorPausedBg;
369+
}
370+
}
371+
}
372+
}
373+

0 commit comments

Comments
 (0)