Skip to content

Commit 762f43f

Browse files
committed
[Frontend] Styling TC unsynced elements
Fixes #933 WIP: Styling for unsynced elements
1 parent 523d674 commit 762f43f

File tree

8 files changed

+25
-12
lines changed

8 files changed

+25
-12
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
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>
2525
<span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
26+
<span class="icon-alert t-icon-alert flex-elem">Icon here</span>
2627
<mct-representation
2728
key="'menu-arrow'"
2829
mct-object='domainObject'

platform/commonUI/general/res/sass/_data-status.scss

+10
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,13 @@
55
}
66
}
77

8+
.s-status-timeconductor-unsynced {
9+
// Layout frames
10+
11+
// Plot areas
12+
.gl-plot .gl-plot-display-area {
13+
border: 1px solid $c;
14+
@include animTo($animName: pulsePaused, $propName: border-color, $propValStart: rgba($c, 0.8), $propValEnd: rgba($c, 0.5), $dur: $animPausedPulseDur, $dir: alternate, $count: infinite);
15+
}
16+
}
17+

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
@include pulse($animName: pulse-subtle, $dur: 500ms, $opacity0: 0.7);
4040
}
4141

42-
@mixin animTo($animName, $propName, $propValStart, $propValEnd, $dur: 500ms, $delay: 0) {
42+
@mixin animTo($animName, $propName, $propValStart, $propValEnd, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
4343
@include keyframes($animName) {
4444
from { #{propName}: $propValStart; }
4545
to { #{$propName}: $propValEnd; }
4646
}
47-
@include animToParams($animName, $dur: 500ms, $delay: 0)
47+
@include animToParams($animName, $dur: $dur, $delay: $delay, $dir: $dir, $count: $count)
4848
}
4949

50-
@mixin animToParams($animName, $dur: 500ms, $delay: 0) {
50+
@mixin animToParams($animName, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
5151
@include animation-name($animName);
5252
@include animation-duration($dur);
5353
@include animation-delay($delay);
5454
@include animation-fill-mode(both);
55-
@include animation-direction(normal);
56-
@include animation-iteration-count(1);
55+
@include animation-direction($dir);
56+
@include animation-iteration-count($count);
5757
@include animation-timing-function(ease-in-out);
5858
}

platform/commonUI/general/res/sass/features/_imagery.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
.s-image-main {
7575
border: 1px solid transparent;
7676
&.paused {
77-
border-color: $colorPausedBg;
77+
//border-color: $colorPausedBg;
78+
@include s-status-for-block-elem($c: $colorPausedBg);
7879
}
7980
}
8081

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

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ $colorProgressBarAmt: $colorKey;
103103
$progressBarHOverlay: 15px;
104104
$progressBarStripeW: 20px;
105105
$shdwStatusIc: rgba(black, 0.4) 0 1px 2px;
106+
$animPausedPulseDur: 500ms;
106107

107108
// Selects
108109
$colorSelectBg: $colorBtnBg;

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

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ $colorProgressBarAmt: #0a0;
103103
$progressBarHOverlay: 15px;
104104
$progressBarStripeW: 20px;
105105
$shdwStatusIc: rgba(white, 0.8) 0 0px 5px;
106+
$animPausedPulseDur: 1s;
106107

107108
// Selects
108109
$colorSelectBg: #ddd;

platform/features/layout/res/templates/layout.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
ng-repeat="childObject in composition"
2727
ng-style="controller.getFrameStyle(childObject.getId())">
2828

29-
<div class="frame child-frame holder contents abs">
30-
<mct-representation key="'frame'"
31-
mct-object="childObject">
32-
</mct-representation>
33-
</div>
29+
<mct-representation key="'frame'"
30+
class="frame child-frame holder contents abs"
31+
mct-object="childObject">
32+
</mct-representation>
3433
<!-- Drag handles -->
3534
<span ng-show="domainObject.hasCapability('editor')">
3635

platform/features/plot/res/templates/plot.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
ng-mousemove="subplot.hover($event)"
8383
mct-drag="subplot.continueDrag($event)"
8484
mct-drag-down="subplot.startDrag($event)"
85-
mct-drag-up="subplot.endDrag($event); plot.update();">
85+
mct-drag-up="subplot.endDrag($event); plot.update()">
8686
</mct-chart>
8787
<!-- TODO: Move into correct position; make part of group; infer from set of actions -->
8888
<div class="l-local-controls gl-plot-local-controls t-plot-display-controls"

0 commit comments

Comments
 (0)