Skip to content

Commit c8ee9e1

Browse files
author
Lukasz Borowiec
committed
Merge branch '514_content-snapshot-category-admin-page' into 512_content-snapshot-block-admin-page
2 parents f7dfa4c + 49b58e2 commit c8ee9e1

File tree

21 files changed

+410
-37
lines changed

21 files changed

+410
-37
lines changed

app/code/Magento/PageBuilder/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Page,Page
1616
"Page with ID: %s doesn't exist","Page with ID: %s doesn't exist"
1717
"ID: %s","ID: %s"
1818
Condition,Condition
19+
"Photo upload is available in full screen mode","Photo upload is available in full screen mode"
1920
"This will change your Admin and storefront by:","This will change your Admin and storefront by:"
2021
"Removing PageBuilder's advanced content tools","Removing PageBuilder's advanced content tools"
2122
"from their assigned text fields and adding a basic text editor as replacement.","from their assigned text fields and adding a basic text editor as replacement."

app/code/Magento/PageBuilder/view/adminhtml/ui_component/category_form.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@
1212
<item name="config" xsi:type="array">
1313
<item name="wysiwygConfigData" xsi:type="array">
1414
<item name="is_pagebuilder_enabled" xsi:type="boolean">true</item>
15+
<item name="pagebuilder_content_snapshot" xsi:type="boolean">true</item>
1516
<item name="pagebuilder_button" xsi:type="boolean">true</item>
1617
</item>
1718
</item>
1819
</argument>
20+
<settings>
21+
<additionalClasses>
22+
<class name="admin__field-wide admin__field-page-builder">true</class>
23+
</additionalClasses>
24+
</settings>
1925
</field>
2026
</fieldset>
2127
</form>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,33 @@
4545
}
4646
}
4747
}
48+
49+
//
50+
// Page Builder full width field
51+
// _____________________________________________
52+
53+
.admin__fieldset {
54+
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option) {
55+
> .admin__field-label {
56+
margin-bottom: @indent__xs;
57+
margin-top: @indent__xs;
58+
min-height: 32px;
59+
60+
span[data-config-scope] {
61+
&:before {
62+
left: 0;
63+
}
64+
}
65+
}
66+
}
67+
}
68+
69+
.admin__field-wide.admin__field-page-builder {
70+
margin-bottom: 32px;
71+
72+
button.action-default {
73+
position: absolute;
74+
right: 0;
75+
top: @indent__xs;
76+
}
77+
}

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

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
// */
55

66
@border-size: 2px;
7+
@wysiwyg-overlay-background: #0078f9;
8+
@wysiwyg-overlay-border: #4181e4;
79

810
.pagebuilder-header {
911
opacity: 0;
@@ -25,6 +27,16 @@
2527
}
2628
}
2729

30+
.pagebuilder-content-snapshot {
31+
.pagebuilder-header {
32+
display: none;
33+
34+
&.visible {
35+
display: block;
36+
}
37+
}
38+
}
39+
2840
.admin__fieldset > .admin__field > .admin__control-grouped {
2941
&.pagebuilder-active {
3042
float: left;
@@ -46,6 +58,22 @@
4658
pointer-events: none;
4759
}
4860

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+
4977
&.stage-full-screen {
5078
-moz-transform: translateZ(0);
5179
-webkit-transform: translateZ(0);
@@ -139,6 +167,47 @@
139167
}
140168
}
141169

170+
171+
.pagebuilder-wysiwyg-overlay {
172+
display: none;
173+
height: 0;
174+
left: -1px;
175+
position: absolute;
176+
top: -1px;
177+
visibility: hidden;
178+
width: 0;
179+
180+
&.visible {
181+
-moz-transition: .175s ease-in-out;
182+
-webkit-transition: .175s ease-in-out;
183+
border: 2px solid transparent;
184+
border-radius: 2px;
185+
cursor: pointer;
186+
display: block;
187+
height: calc(~'100% + 2px');
188+
transform: translateY(-2px);
189+
transition: .175s ease-in-out;
190+
visibility: visible;
191+
width: calc(~'100% + 2px');
192+
z-index: @z-index-2;
193+
}
194+
195+
&._hover {
196+
background-color: fade(@wysiwyg-overlay-background, 8%);
197+
border-color: @wysiwyg-overlay-border;
198+
transform: translateY(0);
199+
}
200+
201+
._keyfocus & {
202+
opacity: 1;
203+
transform: translateY(0);
204+
}
205+
}
206+
207+
.pagebuilder-wysiwyg-wrapper {
208+
position: relative;
209+
}
210+
142211
.pagebuilder-wysiwyg-wrapper.pagebuilder-transition-out .pagebuilder-stage-wrapper {
143212
.pagebuilder-stage-wrapper.stage-full-screen;
144213

@@ -181,7 +250,6 @@
181250
padding: 0;
182251
transition: margin-left .35s ease-in-out;
183252
user-select: none;
184-
185253
&.stage-full-screen {
186254
background: @color-black;
187255
}
@@ -239,6 +307,21 @@
239307
}
240308
}
241309

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+
242325
.pagebuilder-row-wrapper,
243326
.pagebuilder-structure-wrapper {
244327
display: inline-block;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
.pagebuilder-panel-wrapper {
5050
-moz-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
5151
-webkit-transition: opacity .75s ease-in-out, visibility .75s ease-in-out;
52+
display: none;
5253
float: left;
5354
opacity: 0;
5455
position: relative;
@@ -64,8 +65,10 @@
6465
}
6566

6667
&.visible {
68+
display: block;
6769
opacity: 1;
6870
visibility: visible;
71+
z-index: 1;
6972

7073
&.sticky-top {
7174
position: fixed;

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js

Lines changed: 20 additions & 2 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/js/content-type/image/preview.js

Lines changed: 22 additions & 0 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/js/content-type/preview.js

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)