Merge branch 'develop' into ACQE-6192_mainline_PR_deployment

Author: nikhilsharma-adobe

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml

@@ -15,6 +15,7 @@
             <argument name="firstButtonIndex" defaultValue="1" type="string"/>
             <argument name="secondButtonIndex" defaultValue="2" type="string"/>
         </arguments>
+        <waitForPageLoad stepKey="waitForPageLoadToAssert"/>
         <comment userInput="validateButtonItemsSameSize" stepKey="comment"/>
         <waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
         <seeElement selector="{{buttonGroupPage.sameSizeValue(buttonGroupIndex, PageBuilderButtonGroupSameSize_Enabled.value)}}" stepKey="seeButtonSameSizeValue"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWhenSwitchingActiveTabTest.xml

@@ -20,7 +20,6 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pagebuilder-tabs-content"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml

@@ -80,6 +80,7 @@
         <waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="seeSearchResultHighlighted"/>
 
         <!--Select another page from dropdown-->
+	<scrollTo selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="scrollToLinks"/>
         <waitForElementClickable selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="waitForCMSPageBClickable"/>
         <click selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="clickCMSPageBOnSearchResult"/>
         <grabTextFrom selector="{{PageBuilderLinkAttributeAdmin.DropdownInput}}" stepKey="textFromDropDown2"/>

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);
     }
 
     /**