Skip to content

Commit db94fd9

Browse files
committed
Merge branch '511_content-snapshot-product-admin-page' into 510_content-snapshot-cms-admin-page
2 parents 94bd73d + 32f24dd commit db94fd9

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function afterSetupAttributeContainerMeta(
9090
[
9191
'additionalFieldsetClasses' => [
9292
'admin__field-wide' => true,
93-
'admin__field-page-builder' => true
93+
'admin__fieldset-page-builder' => true
9494
],
9595
'template' => 'Magento_PageBuilder/form/components/group/group'
9696
]

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

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
// _____________________________________________
5252

5353
.admin__fieldset {
54-
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option) {
54+
> .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option),
55+
.admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
5556
> .admin__field-label {
5657
margin-bottom: @indent__xs;
5758
margin-top: @indent__xs;
@@ -65,14 +66,45 @@
6566
}
6667
}
6768

68-
/* Product */
69+
// Product page
6970
> fieldset.admin__field-page-builder {
7071
.admin__field-label {
7172
text-align: left;
7273

7374
span[data-config-scope] {
7475
&:before {
75-
right: unset;
76+
right: auto;
77+
}
78+
}
79+
}
80+
}
81+
82+
.admin__field.admin__field-wide.admin__fieldset-page-builder {
83+
> .admin__field-control {
84+
width: calc(~'100% - 30px');
85+
86+
.admin__field.admin__field-wide.admin__field-page-builder {
87+
position: relative;
88+
89+
.admin__field-control {
90+
clear: left;
91+
}
92+
}
93+
}
94+
}
95+
96+
.admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
97+
> .admin__field-label {
98+
display: block;
99+
line-height: @field-label__font-size;
100+
margin-left: 0;
101+
position: relative;
102+
text-align: left;
103+
width: auto;
104+
105+
span[data-config-scope] {
106+
&:before {
107+
right: auto;
76108
}
77109
}
78110
}

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ define([
180180
if (event.which === 13 || event.keyCode === 13) {
181181
this.pageBuilderEditButtonClick(context, event);
182182
}
183+
183184
return true;
184185
},
185186

0 commit comments

Comments
 (0)