Skip to content

Commit 58e73ce

Browse files
danmooney2danmooney2
committed
MC-3870: Background does not conform to border radius for banner, image, contained row & video
Fix issues with merge
1 parent e7c800a commit 58e73ce

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<!-- Advanced Configuration -->
5050
<element name="alignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5151
<element name="noAlignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
52-
<element name="border" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
53-
<element name="borderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
54-
<element name="noBorderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
55-
<element name="borderWidth" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
56-
<element name="borderRadius" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
52+
<element name="border" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
53+
<element name="borderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
54+
<element name="noBorderColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>
55+
<element name="borderWidth" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
56+
<element name="borderRadius" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
5757
<element name="cssClasses" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
5858
<element name="noCssClasses" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][not(@class)]" parameterized="true"/>
5959
<element name="margins" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
@@ -103,11 +103,11 @@
103103
<!-- Advanced Configuration -->
104104
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
105105
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
106-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
107-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
108-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
109-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
110-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
106+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
107+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
108+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
109+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
110+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='wrapper'])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
111111
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
112112
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]" parameterized="true"/>
113113
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,15 @@
236236
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
237237
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
238238
</element>
239+
<element name="overlay">
240+
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/overlay-border-radius"/>
241+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
242+
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
243+
<style name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
244+
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
245+
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
246+
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
247+
</element>
239248
<element name="wrapper">
240249
<style name="background_color" source="background_color"/>
241250
<style name="background_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image" persistence_mode="write"/>
@@ -250,15 +259,6 @@
250259
<style name="text_align" source="text_align"/>
251260
<attribute name="background_images" source="data-background-images"/>
252261
</element>
253-
<element name="overlay">
254-
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/overlay-border-radius"/>
255-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
256-
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
257-
<style name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
258-
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
259-
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
260-
<attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
261-
</element>
262262
<element name="content">
263263
<html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
264264
</element>

0 commit comments

Comments
 (0)