Skip to content

Commit 140e31c

Browse files
committed
MC-3864: Fix alpha value in background colour
- Fix alpha colours on borders and divider
1 parent 0ed8e97 commit 140e31c

File tree

18 files changed

+32
-32
lines changed

18 files changed

+32
-32
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<elements>
2525
<element name="main">
2626
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
27-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
27+
<style name="border_color" source="border_color"/>
2828
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
2929
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3030
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
@@ -99,7 +99,7 @@
9999
<elements>
100100
<element name="main">
101101
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
102-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
102+
<style name="border_color" source="border_color"/>
103103
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
104104
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
105105
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
@@ -174,7 +174,7 @@
174174
<elements>
175175
<element name="main">
176176
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
177-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
177+
<style name="border_color" source="border_color"/>
178178
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
179179
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
180180
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
@@ -250,7 +250,7 @@
250250
<elements>
251251
<element name="main">
252252
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
253-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
253+
<style name="border_color" source="border_color"/>
254254
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
255255
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
256256
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<element name="main">
2727
<style name="text_align" source="text_align"/>
2828
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
29-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
29+
<style name="border_color" source="border_color"/>
3030
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3131
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3232
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<element name="link">
3838
<style name="text_align" source="text_align"/>
3939
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
40-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
40+
<style name="border_color" source="border_color"/>
4141
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
4242
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4343
<style name="margins" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/margins" converter="Magento_PageBuilder/js/converter/style/margins"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<element name="main">
3030
<style name="text_align" source="text_align"/>
3131
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
32-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
32+
<style name="border_color" source="border_color"/>
3333
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3434
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3535
<style name="display" source="display" converter="Magento_PageBuilder/js/content-type/buttons/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
@@ -50,7 +50,7 @@
5050
<element name="main">
5151
<style name="text_align" source="text_align"/>
5252
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
53-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
53+
<style name="border_color" source="border_color"/>
5454
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
5555
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
5656
<static_style source="display" value="flex"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<style name="background_attachment" source="background_attachment"/>
4343
<style name="text_align" source="text_align"/>
4444
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
45-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
45+
<style name="border_color" source="border_color"/>
4646
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4747
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
4848
<style name="justify_content" source="justify_content" persistence_mode="read"/>
@@ -90,7 +90,7 @@
9090
<style name="background_attachment" source="background_attachment"/>
9191
<style name="text_align" source="text_align"/>
9292
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
93-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
93+
<style name="border_color" source="border_color"/>
9494
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
9595
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
9696
<style name="justify_content" source="justify_content" persistence_mode="read"/>
@@ -138,7 +138,7 @@
138138
<style name="background_attachment" source="background_attachment"/>
139139
<style name="text_align" source="text_align"/>
140140
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
141-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
141+
<style name="border_color" source="border_color"/>
142142
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
143143
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
144144
<style name="justify_content" source="justify_content" persistence_mode="read"/>
@@ -186,7 +186,7 @@
186186
<style name="background_attachment" source="background_attachment"/>
187187
<style name="text_align" source="text_align"/>
188188
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
189-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
189+
<style name="border_color" source="border_color"/>
190190
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
191191
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
192192
<style name="justify_content" source="justify_content" persistence_mode="read"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<element name="main">
2626
<style name="text_align" source="text_align"/>
2727
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
28-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
28+
<style name="border_color" source="border_color"/>
2929
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3030
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3131
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>
@@ -38,7 +38,7 @@
3838
<element name="line">
3939
<style name="line_width" source="width"/>
4040
<style name="line_thickness" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
41-
<style name="line_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
41+
<style name="line_color" source="border_color"/>
4242
</element>
4343
</elements>
4444
</appearance>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<element name="main">
2727
<style name="text_align" source="text_align"/>
2828
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
29-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
29+
<style name="border_color" source="border_color"/>
3030
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3131
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3232
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<element name="main">
2626
<style name="text_align" source="text_align"/>
2727
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
28-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
28+
<style name="border_color" source="border_color"/>
2929
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3030
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3131
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<element name="main">
2727
<style name="text_align" source="text_align"/>
2828
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
29-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
29+
<style name="border_color" source="border_color"/>
3030
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3131
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3232
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<element name="main">
2727
<style name="text_align" source="text_align"/>
2828
<style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
29-
<style name="border_color" source="border_color" converter="Magento_PageBuilder/js/converter/style/color"/>
29+
<style name="border_color" source="border_color"/>
3030
<style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
3131
<style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
3232
<style name="display" source="display" converter="Magento_PageBuilder/js/converter/style/display" preview_converter="Magento_PageBuilder/js/converter/style/preview/display"/>

0 commit comments

Comments
 (0)