diff --git a/src/plugins/timeConductor/Conductor.vue b/src/plugins/timeConductor/Conductor.vue index a73bc5197b..9a5a8a6078 100644 --- a/src/plugins/timeConductor/Conductor.vue +++ b/src/plugins/timeConductor/Conductor.vue @@ -27,65 +27,61 @@ -
- -
- -
Start
- - -
- -
- -
- -
+
+ +
Start
+ +
-
- -
- -
End
- - -
+
+ +
+ +
-
- -
- +
+ +
+ {{ isFixed ? 'End' : 'Updated' }}
+ + +
+ +
+ +
+
@@ -406,5 +434,3 @@ export default { } } - - diff --git a/src/plugins/timeConductor/ConductorAxis.vue b/src/plugins/timeConductor/ConductorAxis.vue index 2049d87f70..479b2132bb 100644 --- a/src/plugins/timeConductor/ConductorAxis.vue +++ b/src/plugins/timeConductor/ConductorAxis.vue @@ -37,6 +37,7 @@ @include bgTicks($c: rgba($colorBodyFg, 0.4)); background-position: 0 50%; background-size: 5px 2px; + border-radius: $controlCr; height: $h; svg { @@ -76,34 +77,37 @@ body.desktop .is-fixed-mode & { @include cursorGrab(); background-size: 3px 30%; - border-radius: $controlCr; background-color: $colorBodyBgSubtle; - box-shadow: inset rgba(black, 0.2) 0 1px 1px; + box-shadow: inset rgba(black, 0.4) 0 1px 1px; + transition: $transOut; svg text { fill: $colorBodyFg; stroke: $colorBodyBgSubtle; + transition: $transOut; } &:hover, &:active { $c: $colorKeySubtle; background-color: $c; + transition: $transIn; svg text { stroke: $c; + transition: $transIn; } } } .is-realtime-mode & { + $c: 1px solid rgba($colorTime, 0.7); + border-left: $c; + border-right: $c; svg text { fill: $colorTime; } - } } - -