Skip to content

Commit c64a09f

Browse files
committed
MC-3864: Fix alpha value in background colour
- Remove legacy preferred color format converters
1 parent 6646327 commit c64a09f

File tree

5 files changed

+22
-158
lines changed

5 files changed

+22
-158
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ Contained:
8282
Attributes
8383
1. data-enable-parallax [1, 0]
8484
2. data-parallax-speed [0-1]
85-
3. data-background-color-format [hex, rgb, hsl, hsv, name, none]
86-
4. class
85+
3. class
8786

8887
Full Width:
8988
```
@@ -105,8 +104,7 @@ Attributes
105104
3. data-appearance [full-width, full-bleed]
106105
4. data-enable-parallax [1, 0]
107106
5. data-parallax-speed [0-1]
108-
6. data-background-color-format [hex, rgb, hsl, hsv, name, none]
109-
7. class
107+
6. class
110108

111109
Inline styles
112110
1. background-color

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/column.xml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@
6565
<static_style source="flex_direction" value="column"/>
6666
</element>
6767
</elements>
68-
<converters>
69-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
70-
<config>
71-
<item name="background_color_format" value="background_color_format"/>
72-
</config>
73-
</converter>
74-
</converters>
7568
</appearance>
7669
<appearance name="align-top"
7770
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
@@ -110,13 +103,6 @@
110103
<static_style source="flex_direction" value="column"/>
111104
</element>
112105
</elements>
113-
<converters>
114-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
115-
<config>
116-
<item name="background_color_format" value="background_color_format"/>
117-
</config>
118-
</converter>
119-
</converters>
120106
</appearance>
121107
<appearance name="align-center"
122108
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
@@ -155,13 +141,6 @@
155141
<static_style source="flex_direction" value="column"/>
156142
</element>
157143
</elements>
158-
<converters>
159-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
160-
<config>
161-
<item name="background_color_format" value="background_color_format"/>
162-
</config>
163-
</converter>
164-
</converters>
165144
</appearance>
166145
<appearance name="align-bottom"
167146
preview_template="Magento_PageBuilder/content-type/column/full-height/preview"
@@ -200,13 +179,6 @@
200179
<static_style source="flex_direction" value="column"/>
201180
</element>
202181
</elements>
203-
<converters>
204-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
205-
<config>
206-
<item name="background_color_format" value="background_color_format"/>
207-
</config>
208-
</converter>
209-
</converters>
210182
</appearance>
211183
</appearances>
212184
</type>

app/code/Magento/PageBuilder/view/base/pagebuilder/content_type/row.xml

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
5353
<attribute name="enable_parallax" source="data-enable-parallax"/>
5454
<attribute name="parallax_speed" source="data-parallax-speed"/>
55-
<attribute name="background_color_format" source="data-background-color-format" persistence_mode="write"/>
5655
<css name="css_classes"/>
5756
</element>
5857
<element name="container">
@@ -61,13 +60,6 @@
6160
<static_style source="flex_direction" value="column"/>
6261
</element>
6362
</elements>
64-
<converters>
65-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
66-
<config>
67-
<item name="background_color_format" value="background_color_format"/>
68-
</config>
69-
</converter>
70-
</converters>
7163
</appearance>
7264
<appearance name="full-width"
7365
preview_template="Magento_PageBuilder/content-type/row/full-width/preview"
@@ -95,7 +87,6 @@
9587
<attribute name="appearance" source="data-appearance"/>
9688
<attribute name="enable_parallax" source="data-enable-parallax"/>
9789
<attribute name="parallax_speed" source="data-parallax-speed"/>
98-
<attribute name="background_color_format" source="data-background-color-format" persistence_mode="write"/>
9990
<css name="css_classes"/>
10091
</element>
10192
<element name="inner" />
@@ -105,41 +96,33 @@
10596
<static_style source="flex_direction" value="column"/>
10697
</element>
10798
</elements>
108-
<converters>
109-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
110-
<config>
111-
<item name="background_color_format" value="background_color_format"/>
112-
</config>
113-
</converter>
114-
</converters>
11599
</appearance>
116100
<appearance name="full-bleed"
117101
preview_template="Magento_PageBuilder/content-type/row/full-bleed/preview"
118102
render_template="Magento_PageBuilder/content-type/row/full-bleed/master"
119103
reader="Magento_PageBuilder/js/master-format/read/configurable">
120104
<elements>
121105
<element name="main">
122-
<style name="background_color" source="background_color"/>
123-
<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"/>
124-
<style name="background_position" source="background_position"/>
125-
<style name="background_size" source="background_size"/>
126-
<style name="background_repeat" source="background_repeat"/>
127-
<style name="background_attachment" source="background_attachment"/>
128-
<style name="text_align" source="text_align"/>
129-
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
130-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
131-
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
132-
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
133-
<style name="justify_content" source="justify_content" persistence_mode="read"/>
134-
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
135-
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
136-
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
137-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
138-
<attribute name="name" source="data-role"/>
139-
<attribute name="appearance" source="data-appearance"/>
140-
<attribute name="enable_parallax" source="data-enable-parallax"/>
141-
<attribute name="parallax_speed" source="data-parallax-speed"/>
142-
<attribute name="background_color_format" source="data-background-color-format" persistence_mode="write"/>
106+
<style name="background_color" source="background_color"/>
107+
<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"/>
108+
<style name="background_position" source="background_position"/>
109+
<style name="background_size" source="background_size"/>
110+
<style name="background_repeat" source="background_repeat"/>
111+
<style name="background_attachment" source="background_attachment"/>
112+
<style name="text_align" source="text_align"/>
113+
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
114+
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
115+
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
116+
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
117+
<style name="justify_content" source="justify_content" persistence_mode="read"/>
118+
<style name="min_height" source="min_height" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
119+
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
120+
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/margins"/>
121+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/converter/style/paddings" preview_converter="Magento_PageBuilder/js/content-type/row/converter/style/paddings"/>
122+
<attribute name="name" source="data-role"/>
123+
<attribute name="appearance" source="data-appearance"/>
124+
<attribute name="enable_parallax" source="data-enable-parallax"/>
125+
<attribute name="parallax_speed" source="data-parallax-speed"/>
143126
<css name="css_classes"/>
144127
</element>
145128
<element name="container">
@@ -148,13 +131,6 @@
148131
<static_style source="flex_direction" value="column"/>
149132
</element>
150133
</elements>
151-
<converters>
152-
<converter name="preferred_color_format" component="Magento_PageBuilder/js/mass-converter/preferred-color-format">
153-
<config>
154-
<item name="background_color_format" value="background_color_format"/>
155-
</config>
156-
</converter>
157-
</converters>
158134
</appearance>
159135
</appearances>
160136
</type>

0 commit comments

Comments
 (0)