Merge branch 'develop' into develop

Author: engcom-Hotel

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -648,4 +648,7 @@
         <plugin name="pagebuilder_clear_editor_config_cache"
                 type="Magento\PageBuilder\Plugin\ClearEditorConfigCache" sortOrder="10"/>
     </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
+    </type>
 </config>

app/code/Magento/PageBuilder/etc/di.xml

@@ -184,7 +184,6 @@
         <arguments>
             <argument name="productCollectionFactory" xsi:type="object">pageBuilderProductCollectionFactory</argument>
         </arguments>
-        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
     </type>
     <type name="Magento\Catalog\Helper\Output">
         <arguments>

app/code/Magento/PageBuilder/etc/frontend/di.xml

@@ -12,4 +12,7 @@
     <type name="Magento\Email\Model\Template\Filter">
         <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
+    </type>
 </config>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less

@@ -27,10 +27,6 @@
         margin-left: -20px;
     }
 
-    .product-items {
-        &:extend(.abs-reset-list all);
-    }
-
     .product-item {
         display: inline-block;
         max-width: 100%;
@@ -40,8 +36,6 @@
         vertical-align: top;
         width: 200px;
 
-        &:extend(.abs-add-box-sizing all);
-
         a,
         button,
         .swatch-attribute-options {
@@ -192,24 +186,16 @@
             }
 
             &.towishlist {
-                &:extend(.abs-actions-addto all);
-                .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-wishlist-full,
-                    @_icon-font-position: before
-                );
+                .lib-icon-font-symbol(@_icon-font-content: @icon-wishlist-full, @_icon-font-position: before);
             }
 
             &.tocompare {
-                .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-compare-full,
-                    @_icon-font-position: before
-                );
+                .lib-icon-font-symbol(@_icon-font-content: @icon-compare-full, @_icon-font-position: before);
             }
         }
     }
 
     .product-item-name {
-        &:extend(.abs-product-link all);
         -moz-hyphens: auto;
         -ms-hyphens: auto;
         -webkit-hyphens: auto;
@@ -251,11 +237,7 @@
         }
 
         .rating-summary {
-            .lib-rating-summary(
-                @_icon-font: 'luma-icons',
-                @_icon-font-size: 16px,
-                @_icon-letter-spacing: 2px
-            );
+            .lib-rating-summary(@_icon-font: 'luma-icons', @_icon-font-size: 16px, @_icon-letter-spacing: 2px);
             .lib-rating-summary-label-hide();
 
             display: inline-block;
@@ -274,7 +256,6 @@
         overflow: hidden;
         position: relative;
         z-index: 1;
-        &:extend(.abs-reset-image-wrapper all);
     }
 
     .product-image-container {

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js

@@ -67,7 +67,7 @@ define([
      * @return {Boolean}
      */
     function validateCssClass(str) {
-        return (/^[a-zA-Z _\-\d]+$/i).test(str);
+        return (/^[a-zA-Z\d\-_/:.[\]&@()! ]+$/i).test(str);
     }
 
     /**