Merge branch 'MC-3864-fix-colour-alpha' into cms-team-1-delivery

# Conflicts:
#	app/code/Magento/PageBuilder/docs/master-format.md
#	app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/column.xml
#	app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/row.xml
#	app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/tab_item.xml

Author: davemacaulay

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

@@ -74,9 +74,9 @@
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">rgba(0, 0, 254, 0.92)</data>
-        <data key="rgb">rgb(0, 0, 254)</data>
-        <data key="hex">#0000fe</data>
-        <data key="editPanelValue">#0000fe</data>
+        <data key="rgb">rgba(0, 0, 254, 0.92)</data>
+        <data key="hex">rgba(0, 0, 254, 0.92)</data>
+        <data key="editPanelValue">rgba(0, 0, 254, 0.92)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_HSL_Orange" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>

app/code/Magento/PageBuilder/docs/master-format.md

@@ -82,9 +82,8 @@ Contained:
 Attributes
 1. data-enable-parallax [1, 0]
 2. data-parallax-speed [0-1]
-3. data-background-color-format [hex, rgb, hsl, hsv, name, none]
-4. data-background-images `{"desktop_image":"{{media url}}","mobile_image":"{{media url}}"}`
-5. class
+3. data-background-images `{"desktop_image":"{{media url}}","mobile_image":"{{media url}}"}`
+4. class
 
 Full Width:
 ```
@@ -106,9 +105,8 @@ Attributes
 3. data-appearance [full-width, full-bleed]
 4. data-enable-parallax [1, 0]
 5. data-parallax-speed [0-1]
-6. data-background-color-format [hex, rgb, hsl, hsv, name, none]
-7. data-background-images `{"desktop_image":"{{media url}}","mobile_image":"{{media url}}"}`
-8. class
+6. data-background-images `{"desktop_image":"{{media url}}","mobile_image":"{{media url}}"}`
+7. class
 
 Inline styles
 1. background-color

app/code/Magento/PageBuilder/view/adminhtml/web/js/mass-converter/preferred-color-format.js

@@ -50,7 +50,7 @@
                     <element name="desktop_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <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"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -61,7 +61,7 @@
                     <element name="mobile_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="mobile_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -125,7 +125,7 @@
                     <element name="desktop_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <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"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -136,7 +136,7 @@
                     <element name="mobile_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="mobile_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -200,7 +200,7 @@
                     <element name="desktop_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <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"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -211,7 +211,7 @@
                     <element name="mobile_image">
                         <style name="text_align" source="text_align"/>
                         <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/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="mobile_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -277,7 +277,7 @@
                     </element>
                     <element name="desktop_image">
                         <style name="text_align" source="text_align"/>
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <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"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -286,7 +286,7 @@
                     </element>
                     <element name="mobile_image">
                         <style name="text_align" source="text_align"/>
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="mobile_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/preferred-color-format.ts

@@ -34,7 +34,7 @@
                         reader="Magento_PageBuilder/js/master-format/read/configurable">
                 <elements>
                     <element name="main">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="background_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/container-background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image" persistence_mode="write"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -67,11 +67,6 @@
                     </element>
                 </elements>
                 <converters>
-                    <converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
-                        <config>
-                            <item name="background_color_format" value="background_color_format"/>
-                        </config>
-                    </converter>
                     <converter name="background_images" component="Magento_PageBuilder/js/mass-converter/background-images">
                         <config>
                             <item name="attribute_name" value="background_images"/>
@@ -87,7 +82,7 @@
                         reader="Magento_PageBuilder/js/master-format/read/configurable">
                 <elements>
                     <element name="main">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="background_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/container-background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image" persistence_mode="write"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -120,11 +115,6 @@
                     </element>
                 </elements>
                 <converters>
-                    <converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
-                        <config>
-                            <item name="background_color_format" value="background_color_format"/>
-                        </config>
-                    </converter>
                     <converter name="background_images" component="Magento_PageBuilder/js/mass-converter/background-images">
                         <config>
                             <item name="attribute_name" value="background_images"/>
@@ -140,7 +130,7 @@
                         reader="Magento_PageBuilder/js/master-format/read/configurable">
                 <elements>
                     <element name="main">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="background_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/container-background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image" persistence_mode="write"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -173,11 +163,6 @@
                     </element>
                 </elements>
                 <converters>
-                    <converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
-                        <config>
-                            <item name="background_color_format" value="background_color_format"/>
-                        </config>
-                    </converter>
                     <converter name="background_images" component="Magento_PageBuilder/js/mass-converter/background-images">
                         <config>
                             <item name="attribute_name" value="background_images"/>
@@ -193,7 +178,7 @@
                         reader="Magento_PageBuilder/js/master-format/read/configurable">
                 <elements>
                     <element name="main">
-                        <style name="background_color" source="background_color" converter="Magento_PageBuilder/js/converter/style/color"/>
+                        <style name="background_color" source="background_color"/>
                         <style name="background_image" source="background_image" converter="Magento_PageBuilder/js/converter/style/container-background-image" preview_converter="Magento_PageBuilder/js/converter/style/preview/background-image" persistence_mode="write"/>
                         <style name="background_position" source="background_position"/>
                         <style name="background_size" source="background_size"/>
@@ -226,11 +211,6 @@
                     </element>
                 </elements>
                 <converters>
-                    <converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
-                        <config>
-                            <item name="background_color_format" value="background_color_format"/>
-                        </config>
-                    </converter>
                     <converter name="background_images" component="Magento_PageBuilder/js/mass-converter/background-images">
                         <config>
                             <item name="attribute_name" value="background_images"/>