Skip to content

Commit 35fac95

Browse files
committed
MC-3610: Remove use of legacy system within slide preview
- remove uses of getBackgroundStyles() and getPaddingStyles()
1 parent cf60fad commit 35fac95

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
.pagebuilder-slide {
1111
background-color: @color-gray98;
12+
overflow: hidden;
1213

1314
.pagebuilder-empty-slide {
1415
color: @color-gray65-lighten;

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/preview.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
11+
ko-style="data.main.style"
1112
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
13+
<div ko-style="Object.assign(data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
1314
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1415
<div class="pagebuilder-collage-overlay" ko-style="data.overlay.style()">
1516
<scope args="getUploader().getUiComponent()">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
11+
ko-style="data.main.style"
1112
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
13+
<div ko-style="Object.assign(data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
1314
css="data.main.css"
1415
event="{ mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper }">
1516
<div class="pagebuilder-collage-overlay"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
11+
ko-style="data.main.style"
1112
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
13+
<div ko-style="Object.assign(data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
1314
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1415
<div class="pagebuilder-collage-overlay" ko-style="data.overlay.style">
1516
<scope args="getUploader().getUiComponent()">

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
</element>
4747
<element name="overlay">
4848
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
49-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
5049
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
5150
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
5251
<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"/>
@@ -59,6 +58,7 @@
5958
<style name="background_position" source="background_position"/>
6059
<style name="background_size" source="background_size"/>
6160
<style name="background_repeat" source="background_repeat"/>
61+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
6262
</element>
6363
<element name="mobile_image">
6464
<style name="text_align" source="text_align"/>
@@ -68,6 +68,7 @@
6868
<style name="background_position" source="background_position"/>
6969
<style name="background_size" source="background_size"/>
7070
<style name="background_repeat" source="background_repeat"/>
71+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
7172
</element>
7273
<element name="content">
7374
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -118,7 +119,6 @@
118119
</element>
119120
<element name="overlay">
120121
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
121-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
122122
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
123123
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
124124
<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"/>
@@ -131,6 +131,7 @@
131131
<style name="background_position" source="background_position"/>
132132
<style name="background_size" source="background_size"/>
133133
<style name="background_repeat" source="background_repeat"/>
134+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
134135
</element>
135136
<element name="mobile_image">
136137
<style name="text_align" source="text_align"/>
@@ -140,6 +141,7 @@
140141
<style name="background_position" source="background_position"/>
141142
<style name="background_size" source="background_size"/>
142143
<style name="background_repeat" source="background_repeat"/>
144+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
143145
</element>
144146
<element name="content">
145147
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>
@@ -190,7 +192,6 @@
190192
</element>
191193
<element name="overlay">
192194
<style name="background_color" source="background_color" converter="Magento_PageBuilder/js/content-type/slide/converter/style/overlay-background-color" persistence_mode="write"/>
193-
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
194195
<attribute name="overlay_color" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-color" persistence_mode="read"/>
195196
<attribute name="overlay_transparency" source="data-overlay-color" converter="Magento_PageBuilder/js/content-type/slide/converter/attribute/overlay-transparency" persistence_mode="read"/>
196197
<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"/>
@@ -203,6 +204,7 @@
203204
<style name="background_position" source="background_position"/>
204205
<style name="background_size" source="background_size"/>
205206
<style name="background_repeat" source="background_repeat"/>
207+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
206208
</element>
207209
<element name="mobile_image">
208210
<style name="text_align" source="text_align"/>
@@ -212,6 +214,7 @@
212214
<style name="background_position" source="background_position"/>
213215
<style name="background_size" source="background_size"/>
214216
<style name="background_repeat" source="background_repeat"/>
217+
<style name="padding" storage_key="margins_and_padding" reader="Magento_PageBuilder/js/property/paddings" converter="Magento_PageBuilder/js/content-type/slide/converter/style/paddings"/>
215218
</element>
216219
<element name="content">
217220
<html name="content" preview_converter="Magento_PageBuilder/js/converter/html/directive"/>

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
[data-role='slide'] {
1111
box-sizing: border-box;
12+
overflow: hidden;
1213

1314
> a {
1415
color: inherit;

0 commit comments

Comments
 (0)