MC-3895: Banner and Slide has an overlay transparency field that needs to be removed in favor of transparent color

davemacaulay · davemacaulay · commit e5bba7773fda · 2018-11-27T15:45:45.000-06:00
- Remove overlay transparency field from both banner and slide
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml
@@ -55,10 +55,7 @@
                         <attribute name="background_images" source="data-background-images"/>
                     </element>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <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"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="content">
                         <html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -122,10 +119,7 @@
                         <attribute name="background_images" source="data-background-images"/>
                     </element>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <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"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="content">
                         <html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -189,10 +183,7 @@
                         <attribute name="background_images" source="data-background-images"/>
                     </element>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <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"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="content">
                         <html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -257,11 +248,8 @@
                     <element name="overlay">
                         <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/overlay-border-radius" persistence_mode="write"/>
                         <style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/banner/converter/style/overlay-background-color" persistence_mode="write"/>
+                        <style name="overlay_color" source="background_color"/>
                         <style name="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/banner/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <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"/>
                     </element>
                     <element name="content">
                         <html name="message" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/slide.xml
@@ -43,10 +43,7 @@
                     </element>
                     <element name="empty_link"/>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="wrapper">
                         <style name="background_color" source="background_color"/>
@@ -109,10 +106,7 @@
                     </element>
                     <element name="empty_link"/>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="wrapper">
                         <style name="background_color" source="background_color"/>
@@ -175,10 +169,7 @@
                     </element>
                     <element name="empty_link"/>
                     <element name="overlay">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="wrapper">
                         <style name="background_color" source="background_color"/>
@@ -243,11 +234,8 @@
                     <element name="empty_link"/>
                     <element name="overlay">
                         <style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
                         <style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
-                        <attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
-                        <attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
-                        <attribute name="virtual_overlay_transparency" storage_key="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color-transparency" persistence_mode="write"/>
+                        <style name="overlay_color" source="background_color"/>
                     </element>
                     <element name="wrapper">
                         <style name="background_color" source="background_color"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_banner_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_banner_form.xml
@@ -276,33 +276,6 @@
                 </colorPicker>
             </formElements>
         </field>
-        <field name="overlay_transparency" sortOrder="90" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="default" xsi:type="number">0</item>
-                    <item name="disabledValues" xsi:type="array">
-                        <item name="none" xsi:type="string">never</item>
-                    </item>
-                </item>
-            </argument>
-            <settings>
-                <label translate="true">Overlay Transparency</label>
-                <additionalClasses>
-                    <class name="admin__field-x-small">true</class>
-                </additionalClasses>
-                <addAfter translate="true">%</addAfter>
-                <dataType>text</dataType>
-                <dataScope>overlay_transparency</dataScope>
-                <imports>
-                    <link name="setDisabled">ns = ${ $.ns }, index = show_overlay:value</link>
-                </imports>
-                <validation>
-                    <rule name="validate-number" xsi:type="boolean">true</rule>
-                    <rule name="less-than-equals-to" xsi:type="number">100</rule>
-                    <rule name="greater-than-equals-to" xsi:type="number">0</rule>
-                </validation>
-            </settings>
-        </field>
     </fieldset>
     <fieldset name="advanced">
         <field name="margins_and_padding">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml
@@ -292,33 +292,6 @@
                 </colorPicker>
             </formElements>
         </field>
-        <field name="overlay_transparency" sortOrder="90" formElement="input">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="default" xsi:type="number">0</item>
-                    <item name="disabledValues" xsi:type="array">
-                        <item name="none" xsi:type="string">never</item>
-                    </item>
-                </item>
-            </argument>
-            <settings>
-                <label translate="true">Overlay Transparency</label>
-                <additionalClasses>
-                    <class name="admin__field-x-small">true</class>
-                </additionalClasses>
-                <addAfter translate="true">%</addAfter>
-                <dataType>text</dataType>
-                <dataScope>overlay_transparency</dataScope>
-                <imports>
-                    <link name="setDisabled">ns = ${ $.ns }, index = show_overlay:value</link>
-                </imports>
-                <validation>
-                    <rule name="validate-number" xsi:type="boolean">true</rule>
-                    <rule name="less-than-equals-to" xsi:type="number">100</rule>
-                    <rule name="greater-than-equals-to" xsi:type="number">0</rule>
-                </validation>
-            </settings>
-        </field>
     </fieldset>
     <fieldset name="advanced">
         <field name="margins_and_padding">
