From c7787aa1f0a68a003ecb0458c43bc9cc3c9383aa Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 6 Jun 2017 16:18:22 -0700 Subject: [PATCH] [Frontend] WIP remove keyframe anims Fixes #1603 Remove keyframe anims from transition to edit mode --- .../res/sass/user-environ/_layout.scss | 55 +++++++++++-------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 55ac9887a2..2e927ddb34 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -227,6 +227,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane { top: $ueTopBarH + $interiorMarginLg; } +.l-object-wrapper { + padding: 0; + @include trans-prop-nice(padding, 0.25s); +} + .l-object-wrapper-inner { @include trans-prop-nice-resize(0.25s); } @@ -354,37 +359,39 @@ body.desktop { background-color: $colorEditAreaBg; border-radius: $controlCr; border: 1px dotted $bC0; + padding: 5px; - // Transition 1 - @include keyframes(wrapperIn) { - from { border: 0px dotted transparent; padding: 0; } - to { border: 1px dotted $bC0; padding: 5px; } - } + //// Transition 1 + //@include keyframes(wrapperIn) { + // from { border: 0px dotted transparent; padding: 0; } + // to { border: 1px dotted $bC0; padding: 5px; } + //} + // + //// Do last + //@include keyframes(pulseNew) { + // from { border-color: $bC0; } + // to { border-color: $bC100; } + //} - // Do last - @include keyframes(pulseNew) { - from { border-color: $bC0; } - to { border-color: $bC100; } - } - - @include animation-name(wrapperIn, pulseNew); - @include animation-duration($t1Dur, $pulseDur); - @include animation-delay(0s, $t1Dur + $t2Dur); - @include animation-direction(normal, alternate); - @include animation-fill-mode(both, none); - @include animation-iteration-count(1, infinite); - @include animation-timing-function(ease-in-out, linear); + //@include animation-name(wrapperIn, pulseNew); + //@include animation-duration($t1Dur, $pulseDur); + //@include animation-delay(0s, $t1Dur + $t2Dur); + //@include animation-direction(normal, alternate); + //@include animation-fill-mode(both, none); + //@include animation-iteration-count(1, infinite); + //@include animation-timing-function(ease-in-out, linear); .l-edit-controls { - height: 0; + //height: 0; + height: $ueEditToolBarH + $interiorMargin; margin-bottom: $interiorMargin; border-bottom: 1px solid $colorInteriorBorder; // Transition 2: reveal edit controls - @include keyframes(editIn) { - from { border-bottom: 0px solid transparent; height: 0; margin-bottom: 0; } - to { border-bottom: 1px solid $colorInteriorBorder; height: $ueEditToolBarH + $interiorMargin; margin-bottom: $interiorMargin; } - } - @include animToParams(editIn, $dur: $t2Dur, $delay: $t1Dur); + //@include keyframes(editIn) { + // from { border-bottom: 0px solid transparent; height: 0; margin-bottom: 0; } + // to { border-bottom: 1px solid $colorInteriorBorder; height: $ueEditToolBarH + $interiorMargin; margin-bottom: $interiorMargin; } + //} + //@include animToParams(editIn, $dur: $t2Dur, $delay: $t1Dur); .tool-bar { right: $interiorMargin; }