Skip to content

Commit f1df3fd

Browse files
committed
MC-5025: Right/Left Margin Not Working For Content Types
- move margins to main element so that negative bottom margin will overlap below elements as expected - update test selectors - update master format doc
1 parent b137b23 commit f1df3fd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
3333
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video-inner')])[{{arg1}}]/parent::div[contains(@class,'{{arg2}}')]" parameterized="true"/>
3434
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]" parameterized="true"/>
35-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
35+
<element name="margins" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
3636
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3737
</section>
3838
<section name="VideoOnStorefront">
@@ -57,7 +57,7 @@
5757
<element name="borderRadius" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
5858
<element name="cssClasses" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
5959
<element name="noCssClasses" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(@class)]" parameterized="true"/>
60-
<element name="margins" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
60+
<element name="margins" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
6161
<element name="padding" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6262
</section>
6363
</sections>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<element name="main">
2727
<style name="text_align" source="text_align"/>
2828
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
29+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
2930
<attribute name="name" source="data-role"/>
3031
<attribute name="appearance" source="data-appearance"/>
3132
<css name="css_classes"/>
@@ -38,7 +39,6 @@
3839
<style name="border_color" source="border_color"/>
3940
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4041
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
41-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
4242
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
4343
</element>
4444
<element name="video">

docs/reference/master-format.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ Attributes
462462

463463
Inline styles
464464
1. justify-content
465+
2. margin
465466

466467
### inner element
467468

@@ -482,8 +483,7 @@ Inline styles
482483
2. border-color
483484
3. border-width
484485
4. border-radius
485-
5. margin
486-
6. padding
486+
5. padding
487487

488488
### video element
489489

0 commit comments

Comments
 (0)