Skip to content

Commit 8b8b4f7

Browse files
committed
#514: User sees content snapshot on Category Page in Admin Panel - Fixed animation delay
1 parent 5176b32 commit 8b8b4f7

File tree

6 files changed

+126
-102
lines changed

6 files changed

+126
-102
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -284,18 +284,7 @@
284284
}
285285

286286
.stage-content-snapshot {
287-
&.stage-full-screen {
288-
.pagebuilder-stage {
289-
margin-left: auto;
290-
}
291-
}
292-
293287
.pagebuilder-stage {
294-
-moz-transition: none;
295-
-webkit-transition: none;
296-
margin-left: auto;
297-
transition: none;
298-
299288
.pagebuilder-canvas {
300289
padding-bottom: 0;
301290
padding-top: 8px;
@@ -304,57 +293,59 @@
304293
}
305294

306295
.pagebuilder-wysiwyg-snapshot {
296+
.pagebuilder-stage {
297+
background-color: @color-white;
298+
-webkit-transition: .3s ease-in-out;
299+
-moz-transition: .3s ease-in-out;
300+
transition: .3s ease-in-out;
301+
margin-left: auto;
302+
}
303+
307304
.pagebuilder-stage-wrapper {
308-
-moz-transition-delay: 0s;
309-
-webkit-transition-delay: 0s;
310-
transition-delay: 0s;
305+
transition: none;
306+
background-color: transparent;
307+
311308
&.stage-full-screen {
312-
-moz-transition-delay: .25s;
313-
-webkit-transition-delay: .25s;
314-
transition-delay: .25s;
309+
.pagebuilder-stage {
310+
width: calc(~"100% - 150px");
311+
top: 0;
312+
left: 0;
313+
position: relative;
314+
}
315315
}
316316
}
317317

318-
.pagebuilder-stage {
319-
margin-left: 0;
320-
}
321-
322318
.pagebuilder-header {
323319
.keyframes(slide-in-top;{
324320
0% {
325321
-webkit-transform: translateY(-41px);
326322
transform: translateY(-41px);
327-
opacity: 0;
328323
}
329324
100% {
330325
-webkit-transform: translateY(0);
331326
transform: translateY(0);
332-
opacity: 1;
333327
}
334328
});
335-
.animation(slide-in-top .35s .15s ease-in-out both);
329+
.animation(slide-in-top .3s ease-in-out both);
336330
opacity: 1;
337331
transition: none;
338332
visibility: visible;
339333

340-
&.transition {
334+
&.transition-out {
341335
.pagebuilder-stage-wrapper.stage-full-screen.pagebuilder-header;
342336
.keyframes(slide-out-top;{
343337
0% {
344338
-webkit-transform: translateY(0);
345339
transform: translateY(0);
346-
opacity: 1;
347340
}
348-
349341
100% {
350342
-webkit-transform: translateY(-41px);
351343
transform: translateY(-41px);
352-
opacity: 0;
353344
}
354345
});
355-
.animation(slide-out-top .35s 0s ease-in-out both);
346+
.animation(slide-out-top .3s ease-in-out both);
356347
transition: none;
357-
z-index: 800;
348+
z-index: 801;
358349
}
359350
}
360351

@@ -363,36 +354,32 @@
363354
0% {
364355
-webkit-transform: translateX(-150px);
365356
transform: translateX(-150px);
366-
opacity: 0;
367357
}
368358
100% {
369359
-webkit-transform: translateX(0);
370360
transform: translateX(0);
371-
opacity: 1;
372361
}
373362
});
374-
.animation(slide-in-left .35s .15s ease-in-out both);
363+
.animation(slide-in-left .3s ease-in-out both);
375364
opacity: 1;
376365
transition: none;
377366
visibility: visible;
378367

379-
&.transition {
368+
&.transition-out {
380369
.pagebuilder-stage-wrapper.stage-full-screen.pagebuilder-panel-wrapper;
381370
.keyframes(slide-out-left;{
382371
0% {
383372
-webkit-transform: translateX(0);
384373
transform: translateX(0);
385-
opacity: 1;
386374
}
387375
100% {
388376
-webkit-transform: translateX(-150px);
389377
transform: translateX(-150px);
390-
opacity: 0;
391378
}
392379
});
393-
.animation(slide-out-left .35s 0s ease-in-out both);
380+
.animation(slide-out-left .3s ease-in-out both);
394381
transition: none;
395-
z-index: 800;
382+
z-index: 801;
396383
}
397384
}
398385
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder.js

Lines changed: 48 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
-->
77
<div class="pagebuilder-stage"
88
attr="id: id, 'data-role': 'pagebuilder-stage'"
9+
ko-style="$parent.stageStyles"
910
css="'pagebuilder-show-borders': showBorders, 'pagebuilder-no-user-select': !userSelect(), 'panel-collapsed': pageBuilder.panel.isCollapsed, 'interacting': interacting, 'focus-child': focusChild">
1011
<div class="pagebuilder-stage-loading" visible="loading">
1112
<span class="spinner">

app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
css="'stage-full-screen': isFullScreen, 'stage-content-snapshot': isSnapshot"
99
ko-style="wrapperStyles">
1010
<div class="admin__field pagebuilder-header"
11-
css="visible: panel.isVisible(), transition: isSnapshotTransition()"
11+
css="visible: panel.isVisible(), 'transition-out': isSnapshotTransition()"
1212
if="!isSnapshot()">
1313
<button type="button" translate="'Apply Template'" if="isAllowedTemplateApply" click="toggleTemplateManger"/>
1414
<button type="button" translate="'Save as Template'" if="isAllowedTemplateSave" click="saveAsTemplate"/>

app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77

88
<div id="pagebuilder-panel-wrapper" class="pagebuilder-panel-wrapper"
9-
css="visible: isVisible, 'sticky-top': isStickyTop, 'sticky-bottom': isStickyBottom, 'transition': $parent.isSnapshotTransition"
9+
css="visible: isVisible, 'sticky-top': isStickyTop, 'sticky-bottom': isStickyBottom, 'transition-out': $parent.isSnapshotTransition"
1010
afterRender="afterRender">
1111
<div id="pagebuilder-panel" class="pagebuilder-panel">
1212
<div class="search-content-types">

0 commit comments

Comments
 (0)