MC-3870: Background does not conform to border radius for banner, image, contained row & video

Move border styles on image from main to desktop/mobile_image

Author: danmooney2

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

@@ -25,25 +25,35 @@
                 <elements>
                     <element name="main">
                         <style name="text_align" source="text_align"/>
-                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
-                        <style name="border_color" source="border_color"/>
-                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
-                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
                         <style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
                         <style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>
                         <style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
                         <attribute name="name" source="data-role"/>
                         <attribute name="appearance" source="data-appearance"/>
                         <css name="css_classes"/>
                     </element>
+                    <element name="uploader">
+                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
+                        <style name="border_color" source="border_color"/>
+                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
+                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
+                    </element>
                     <element name="desktop_image">
+                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
+                        <style name="border_color" source="border_color"/>
+                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
+                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
                         <static_style source="max-width" value="100%"/>
                         <static_style source="height" value="auto"/>
                         <attribute name="image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
                         <attribute name="alt" source="alt"/>
                         <attribute name="title_attribute" source="title"/>
                     </element>
                     <element name="mobile_image">
+                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
+                        <style name="border_color" source="border_color"/>
+                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
+                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
                         <static_style source="max-width" value="100%"/>
                         <static_style source="height" value="auto"/>
                         <attribute name="mobile_image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/preview.html

@@ -8,9 +8,11 @@
 <div class="pagebuilder-content-type pagebuilder-image type-nested" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <render args="getOptions().template" />
     <figure attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
-        <scope args="getUploader().getUiComponent()">
-            <render />
-        </scope>
+        <div attr="!data.desktop_image.attributes().src ? data.uploader.attributes : {}" ko-style="!data.desktop_image.attributes().src ? data.uploader.style : {}" css="!data.desktop_image.attributes().src ? data.uploader.css : {}">
+            <scope args="getUploader().getUiComponent()">
+                <render />
+            </scope>
+        </div>
         <img if="data.desktop_image.attributes().src"
              attr="data.desktop_image.attributes"
              class="preview-image"