Merge branch '511_content-snapshot-product-admin-page' into 510_content-snapshot-cms-admin-page

Author: artKozynets

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

@@ -90,7 +90,7 @@ public function afterSetupAttributeContainerMeta(
                 [
                     'additionalFieldsetClasses' => [
                         'admin__field-wide' => true,
-                        'admin__field-page-builder' => true
+                        'admin__fieldset-page-builder' => true
                     ],
                     'template' => 'Magento_PageBuilder/form/components/group/group'
                 ]

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

@@ -51,7 +51,8 @@
 //  _____________________________________________
 
 .admin__fieldset {
-    > .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option) {
+    > .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option),
+    .admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
         > .admin__field-label {
             margin-bottom: @indent__xs;
             margin-top: @indent__xs;
@@ -65,14 +66,45 @@
         }
     }
 
-    /* Product */
+    // Product page
     > fieldset.admin__field-page-builder {
         .admin__field-label {
             text-align: left;
 
             span[data-config-scope] {
                 &:before {
-                    right: unset;
+                    right: auto;
+                }
+            }
+        }
+    }
+    
+    .admin__field.admin__field-wide.admin__fieldset-page-builder {
+        > .admin__field-control {
+            width: calc(~'100% - 30px');
+
+            .admin__field.admin__field-wide.admin__field-page-builder {
+                position: relative;
+
+                .admin__field-control {
+                    clear: left;
+                }
+            }
+        }
+    }
+
+    .admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
+        > .admin__field-label {
+            display: block;
+            line-height: @field-label__font-size;
+            margin-left: 0;
+            position: relative;
+            text-align: left;
+            width: auto;
+
+            span[data-config-scope] {
+                &:before {
+                    right: auto;
                 }
             }
         }

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

@@ -180,6 +180,7 @@ define([
             if (event.which === 13 || event.keyCode === 13) {
                 this.pageBuilderEditButtonClick(context, event);
             }
+            
             return true;
         },