Skip to content

Commit 5533396

Browse files
committed
#559: User sees no predefined gutters - Removed default margin and padding for Row
1 parent 75f09a8 commit 5533396

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,20 @@
460460
<data key="name">Margins and Padding</data>
461461
<data key="section">advanced</data>
462462
<data key="fieldName">margins_and_padding</data>
463-
<data key="value">0 0 10</data>
463+
<data key="value">0</data>
464464
<data key="marginTop">0</data>
465465
<data key="marginRight">0</data>
466-
<data key="marginBottom">10</data>
466+
<data key="marginBottom">0</data>
467+
<data key="marginLeft">0</data>
468+
</entity>
469+
<entity name="PageBuilderMarginsPropertyRowStage" type="pagebuilder_margins_property">
470+
<data key="name">Margins and Padding</data>
471+
<data key="section">advanced</data>
472+
<data key="fieldName">margins_and_padding</data>
473+
<data key="value">0 0 1</data>
474+
<data key="marginTop">0</data>
475+
<data key="marginRight">0</data>
476+
<data key="marginBottom">1</data>
467477
<data key="marginLeft">0</data>
468478
</entity>
469479
<entity name="PageBuilderMarginsPropertyColumnDefault" type="pagebuilder_margins_property">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
3535
<argument name="contentType" value="PageBuilderRowContentType"/>
3636
</actionGroup>
37+
<!-- Add Min-height Value -->
38+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinimumHeightProperty">
39+
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
40+
</actionGroup>
3741
<!-- Validate Default Values -->
3842
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
3943
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -57,12 +61,12 @@
5761
<actualResult type="variable">getCssClasses</actualResult>
5862
</assertEmpty>
5963
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
60-
<argument name="property" value="PageBuilderMarginsPropertyRowDefault"/>
64+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
6165
</actionGroup>
6266
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
63-
<argument name="property" value="PageBuilderPaddingProperty10"/>
67+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
6468
</actionGroup>
65-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
69+
<actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
6670
<!-- Validate Stage -->
6771
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
6872
<actionGroup ref="ValidateAdvancedConfigurationWithBorderColorActionGroup" stepKey="validateStage">
@@ -72,12 +76,12 @@
7276
<argument name="borderColor" value="PageBuilderAdvancedBorderColorTransparent"/>
7377
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
7478
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
75-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
79+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
7680
<argument name="index" value="1"/>
7781
</actionGroup>
7882
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
7983
<argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
80-
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
84+
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowStage.value}}"/>
8185
<argument name="cssProperty" value="margin"/>
8286
</actionGroup>
8387
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
@@ -92,12 +96,12 @@
9296
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty0"/>
9397
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
9498
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
95-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
99+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
96100
<argument name="index" value="1"/>
97101
</actionGroup>
98102
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStageAfterSave">
99103
<argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
100-
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
104+
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowStage.value}}"/>
101105
<argument name="cssProperty" value="margin"/>
102106
</actionGroup>
103107
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -126,10 +130,10 @@
126130
<actualResult type="variable">getCssClasses2</actualResult>
127131
</assertEmpty>
128132
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
129-
<argument name="property" value="PageBuilderMarginsPropertyRowDefault"/>
133+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
130134
</actionGroup>
131135
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
132-
<argument name="property" value="PageBuilderPaddingProperty10"/>
136+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
133137
</actionGroup>
134138
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
135139
<argument name="contentType" value="PageBuilderRowContentType"/>
@@ -142,8 +146,8 @@
142146
<argument name="border" value="PageBuilderAdvancedBorderPropertyNone"/>
143147
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty0"/>
144148
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
145-
<argument name="margin" value="PageBuilderMarginsPropertyRowDefault"/>
146-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
149+
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
150+
<argument name="padding" value="PageBuilderPaddingPropertyDefault"/>
147151
<argument name="index" value="1"/>
148152
</actionGroup>
149153
</test>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_row_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<field name="margins_and_padding">
176176
<argument name="data" xsi:type="array">
177177
<item name="config" xsi:type="array">
178-
<item name="default" xsi:type="string">{"margin":{"bottom":"10","left":"0","right":"0","top":"0"},"padding":{"bottom":"10","left":"10","right":"10","top":"10"}}</item>
178+
<item name="default" xsi:type="string">{"margin":{"bottom":null,"left":null,"right":null,"top":null},"padding":{"bottom":null,"left":null,"right":null,"top":null}}</item>
179179
</item>
180180
</argument>
181181
</field>

0 commit comments

Comments
 (0)