Skip to content

Commit 42a4893

Browse files
committed
#514: User sees content snapshot on Category Page in Admin Panel - Added variables for animation values
1 parent 233be88 commit 42a4893

File tree

4 files changed

+34
-17
lines changed

4 files changed

+34
-17
lines changed

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

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@
294294

295295
.pagebuilder-wysiwyg-snapshot {
296296
.pagebuilder-stage {
297-
-webkit-transition: .35s ease-in-out;
298-
-moz-transition: .35s ease-in-out;
299-
transition: .35s ease-in-out;
297+
-webkit-transition: @pagebuilder-transition;
298+
-moz-transition: @pagebuilder-transition;
299+
transition: @pagebuilder-transition;
300300
margin-left: auto;
301301
}
302302

@@ -305,8 +305,10 @@
305305
}
306306

307307
.pagebuilder-stage-wrapper {
308-
transition: none;
308+
-moz-transition: none;
309+
-webkit-transition: none;
309310
background-color: transparent;
311+
transition: none;
310312

311313
&.stage-full-screen {
312314
.keyframes(fade-in;{
@@ -317,7 +319,7 @@
317319
background-color: @color-white;
318320
}
319321
});
320-
.animation(fade-in .175s ease-in-out both);
322+
.animation(fade-in @pagebuilder-animation);
321323
background-color: @color-white;
322324

323325
&.transition-out {
@@ -332,7 +334,7 @@
332334
background-color: transparent;
333335
}
334336
});
335-
.animation(fade-out .35s ease-in-out both);
337+
.animation(fade-out @pagebuilder-animation);
336338
}
337339

338340
.pagebuilder-stage {
@@ -347,15 +349,17 @@
347349
.pagebuilder-header {
348350
.keyframes(slide-in-top;{
349351
0% {
352+
-moz-transform: translateX(-41px);
350353
-webkit-transform: translateY(-41px);
351354
transform: translateY(-41px);
352355
}
353356
100% {
354-
-webkit-transform: translateY(0);
355-
transform: translateY(0);
357+
-moz-transform: translateX(0);
358+
-webkit-transform: translateX(0);
359+
transform: translateX(0);
356360
}
357361
});
358-
.animation(slide-in-top .35s ease-in-out both);
362+
.animation(slide-in-top @pagebuilder-animation);
359363
opacity: 1;
360364
transition: none;
361365
visibility: visible;
@@ -364,15 +368,17 @@
364368
.pagebuilder-stage-wrapper.stage-full-screen.pagebuilder-header;
365369
.keyframes(slide-out-top;{
366370
0% {
367-
-webkit-transform: translateY(0);
368-
transform: translateY(0);
371+
-moz-transform: translateX(0);
372+
-webkit-transform: translateX(0);
373+
transform: translateX(0);
369374
}
370375
100% {
376+
-moz-transform: translateX(-41px);
371377
-webkit-transform: translateY(-41px);
372378
transform: translateY(-41px);
373379
}
374380
});
375-
.animation(slide-out-top .35s ease-in-out both);
381+
.animation(slide-out-top @pagebuilder-animation);
376382
transition: none;
377383
z-index: 801;
378384
}
@@ -381,15 +387,17 @@
381387
.pagebuilder-panel-wrapper {
382388
.keyframes(slide-in-left;{
383389
0% {
390+
-moz-transform: translateX(-150px);
384391
-webkit-transform: translateX(-150px);
385392
transform: translateX(-150px);
386393
}
387394
100% {
395+
-moz-transform: translateX(0);
388396
-webkit-transform: translateX(0);
389397
transform: translateX(0);
390398
}
391399
});
392-
.animation(slide-in-left .35s ease-in-out both);
400+
.animation(slide-in-left @pagebuilder-animation);
393401
opacity: 1;
394402
transition: none;
395403
visibility: visible;
@@ -398,15 +406,17 @@
398406
.pagebuilder-stage-wrapper.stage-full-screen.pagebuilder-panel-wrapper;
399407
.keyframes(slide-out-left;{
400408
0% {
409+
-moz-transform: translateX(0);
401410
-webkit-transform: translateX(0);
402411
transform: translateX(0);
403412
}
404413
100% {
414+
-moz-transform: translateX(-150px);
405415
-webkit-transform: translateX(-150px);
406416
transform: translateX(-150px);
407417
}
408418
});
409-
.animation(slide-out-left .35s ease-in-out both);
419+
.animation(slide-out-left @pagebuilder-animation);
410420
transition: none;
411421
z-index: 801;
412422
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,12 @@
6666
@tab-size: 80px;
6767
@border-width: 2px;
6868
@entity-border-width: 1px;
69+
70+
//
71+
// Transition and Animation Variables
72+
// ---------------------------------------------
73+
74+
@pagebuilder-transition-duration: .35s;
75+
@pagebuilder-transition: @pagebuilder-transition-duration ease-in-out;
76+
@pagebuilder-animation: .35s ease-in-out both;
77+

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

Lines changed: 0 additions & 1 deletion
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/ts/js/page-builder.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export default class PageBuilder implements PageBuilderInterface {
122122
};
123123
this.isFullScreen(true);
124124
if (this.snapshot()) {
125-
this.stageStyles(this.previousStyles);
126125
this.isSnapshot(false);
127126
this.stageStyles(this.previousStyles);
128127
} else {
@@ -177,7 +176,7 @@ export default class PageBuilder implements PageBuilderInterface {
177176
pageBuilderWrapper.css("height", "");
178177
this.previousStyles = {};
179178
this.previousPanelHeight = null;
180-
},350);
179+
}, 350);
181180
}
182181
}
183182

0 commit comments

Comments
 (0)