Merge branch 'MC-13925' into cms-team-1-delivery

Author: davemacaulay

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

@@ -167,4 +167,16 @@
             <expectedResult type="variable">button2Width</expectedResult>
         </assertNotEquals>
     </actionGroup>
+    <actionGroup name="validateButtonItemsDefaultMargin">
+        <arguments>
+            <argument name="buttonItemPage"/>
+            <argument name="buttonIndex" defaultValue="1" type="string"/>
+        </arguments>
+        <comment userInput="Validate default margin" stepKey="comment"/>
+        <executeJS function="return window.getComputedStyle({{buttonItemPage.jsButtonSelector(buttonIndex)}}).margin" stepKey="getDefaultMarginValueStage"/>
+        <assertEquals stepKey="checkDefaultMarginValueStage">
+            <expectedResult type="string">{{PageBuilderMarginsPropertyButtonItemDefault.value}}</expectedResult>
+            <actualResult type="variable">getDefaultMarginValueStage</actualResult>
+        </assertEquals>
+    </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

@@ -418,6 +418,16 @@
         <data key="marginBottom">0</data>
         <data key="marginLeft">0</data>
     </entity>
+    <entity name="PageBuilderMarginsPropertyButtonItemDefault" type="pagebuilder_margins_property">
+        <data key="name">Margins and Padding</data>
+        <data key="section">advanced</data>
+        <data key="fieldName">margins_and_padding</data>
+        <data key="value">0px 10px 10px 0px</data>
+        <data key="marginTop">0</data>
+        <data key="marginRight">10</data>
+        <data key="marginBottom">10</data>
+        <data key="marginLeft">0</data>
+    </entity>
     <!-- Padding -->
     <entity name="PageBuilderPaddingPropertyDefault" type="pagebuilder_padding_property">
         <data key="name">Margins and Padding</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTests.xml

@@ -650,6 +650,9 @@
         <seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage"/>
         <seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage"/>
         <seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage"/>
+        <actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStage">
+            <argument name="buttonItemPage" value="ButtonItemOnStage"/>
+        </actionGroup>
         <seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -661,6 +664,9 @@
         <seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage2"/>
         <seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage2"/>
         <seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage2"/>
+        <actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStage2">
+            <argument name="buttonItemPage" value="ButtonItemOnStage"/>
+        </actionGroup>
         <seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage2"/>
         <!-- Validate Edit Panel After Save -->
         <comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
@@ -703,6 +709,9 @@
         <seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStorefront"/>
         <seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStorefront"/>
         <seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noMargins('1')}}" stepKey="seeNoMarginsStorefront"/>
+        <actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStorefront">
+            <argument name="buttonItemPage" value="ButtonItemOnStorefrontEmptyLink"/>
+        </actionGroup>
         <seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noPadding('1')}}" stepKey="seeNoPaddingStorefront"/>
     </test>
     <test name="ButtonItemUpdateAdvancedConfigurationValues">

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

@@ -9,8 +9,8 @@
 
 .pagebuilder-content-type {
     .pagebuilder-button-item {
+        border: none;
         font-size: 0;
-        margin: 0 10px 10px 0;
         max-width: 100%;
         width: auto;
         z-index: auto;
@@ -26,6 +26,7 @@
         }
 
         a[data-element='link'] {
+            margin: 0 10px 10px 0;
             max-width: 100%;
             min-width: 0;
             position: relative;