Skip to content

Commit b592c3f

Browse files
author
Lukasz Borowiec
committed
#514: User sees content snapshot on Category Page in Admin Panel - fixed functional tests
1 parent d2f0c47 commit b592c3f

File tree

2 files changed

+47
-8
lines changed

2 files changed

+47
-8
lines changed

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

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
@wysiwyg-overlay-border: #4181e4;
99

1010
.pagebuilder-header {
11-
display: none;
1211
opacity: 0;
1312
text-align: right;
1413

@@ -23,12 +22,21 @@
2322
}
2423

2524
&.visible {
26-
display: block;
2725
opacity: 1;
2826
visibility: visible;
2927
}
3028
}
3129

30+
.pagebuilder_content_snapshot {
31+
.pagebuilder-header {
32+
display: none;
33+
34+
&.visible {
35+
display: block;
36+
}
37+
}
38+
}
39+
3240
.admin__fieldset > .admin__field > .admin__control-grouped {
3341
&.pagebuilder-active {
3442
float: left;
@@ -50,6 +58,22 @@
5058
pointer-events: none;
5159
}
5260

61+
&.pagebuilder_content_snapshot {
62+
&.stage-full-screen {
63+
.pagebuilder-header {
64+
display: block;
65+
66+
&.visible {
67+
display: block;
68+
}
69+
}
70+
71+
.pagebuilder-canvas {
72+
padding-bottom: 120px;
73+
}
74+
}
75+
}
76+
5377
&.stage-full-screen {
5478
-moz-transform: translateZ(0);
5579
-webkit-transform: translateZ(0);
@@ -71,7 +95,6 @@
7195
background: @color-very-dark-grayish-orange;
7296
border: none;
7397
border-bottom: 1px solid @color-brownie-almost;
74-
display: block;
7598
left: 150px;
7699
opacity: 0;
77100
padding: 0;
@@ -96,14 +119,12 @@
96119
}
97120

98121
&.visible {
99-
display: block;
100122
opacity: 1;
101123
visibility: visible;
102124
}
103125
}
104126

105127
.pagebuilder-canvas {
106-
padding-bottom: 120px;
107128
padding-top: 30px;
108129
}
109130

@@ -217,15 +238,18 @@
217238
}
218239

219240
.pagebuilder-stage {
241+
-moz-transition: margin-left .35s ease-in-out;
220242
-moz-user-select: none;
221243
-ms-user-select: none;
222244
-o-user-select: none;
245+
-webkit-transition: margin-left .35s ease-in-out;
223246
-webkit-user-select: none;
224247
font-size: 0;
248+
margin-left: 170px;
225249
min-height: 200px;
226250
padding: 0;
251+
transition: margin-left .35s ease-in-out;
227252
user-select: none;
228-
229253
&.stage-full-screen {
230254
background: @color-black;
231255
}
@@ -259,7 +283,7 @@
259283
-moz-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
260284
-webkit-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
261285
opacity: 0;
262-
padding-top: 8px;
286+
padding-bottom: 120px;
263287
transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
264288
visibility: hidden;
265289

@@ -283,6 +307,21 @@
283307
}
284308
}
285309

310+
.pagebuilder_content_snapshot {
311+
.pagebuilder-stage {
312+
-moz-transition: none;
313+
-webkit-transition: none;
314+
margin-left: auto;
315+
transition: none;
316+
317+
.pagebuilder-canvas {
318+
padding-bottom: 0;
319+
padding-top: 8px;
320+
}
321+
322+
}
323+
}
324+
286325
.pagebuilder-row-wrapper,
287326
.pagebuilder-structure-wrapper {
288327
display: inline-block;

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
@@ -5,7 +5,7 @@
55
*/
66
-->
77
<div class="pagebuilder-stage-wrapper"
8-
css="'stage-full-screen': isFullScreen"
8+
css="'stage-full-screen': isFullScreen,'pagebuilder_content_snapshot': !panel.isVisible()"
99
ko-style="wrapperStyles">
1010
<div class="admin__field pagebuilder-header" css="visible: panel.isVisible()">
1111
<button type="button" translate="'Apply Template'" if="isAllowedTemplateApply" click="toggleTemplateManger"/>

0 commit comments

Comments
 (0)