Skip to content

Commit cf4fcb2

Browse files
committed
MC-3610: Remove use of legacy system within slide preview
- move main styles back to fix border radius
1 parent 72413dc commit cf4fcb2

File tree

11 files changed

+12
-88
lines changed

11 files changed

+12
-88
lines changed

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

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

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

1413
.pagebuilder-empty-slide {
1514
color: @color-gray65-lighten;

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js

Lines changed: 0 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
-->
77

88
<div attr="data.main.attributes"
9-
ko-style="data.main.style"
109
css="data.main.css">
1110
<a attr="data.link.attributes"
1211
ko-style="data.link.style"
1312
css="data.link.css">
1413
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-hidden"
1514
css="data.desktop_image.css"
1615
attr="data.desktop_image.attributes"
17-
ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})">
16+
ko-style="Object.assign({}, data.desktop_image.style(), data.main.style(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})">
1817
<div class="pagebuilder-overlay"
1918
attr="data.overlay.attributes"
2019
ko-style="data.overlay.style"
@@ -37,7 +36,7 @@
3736
</div>
3837
</div>
3938
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-only"
40-
ko-style="data.mobile_image.style"
39+
ko-style="Object.assign({}, data.mobile_image.style(), data.main.style())"
4140
attr="data.mobile_image.attributes"
4241
css="data.mobile_image.css">
4342
<div class="pagebuilder-overlay "

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
11-
ko-style="data.main.style"
1211
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
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 + ')'})"
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 + ')'})"
1413
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1514
<div class="pagebuilder-collage-overlay" ko-style="data.overlay.style()">
1615
<scope args="getUploader().getUiComponent()">

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
-->
77

88
<div attr="data.main.attributes"
9-
ko-style="data.main.style"
109
css="data.main.css">
1110
<a attr="data.link.attributes"
1211
ko-style="data.link.style"
1312
css="data.link.css">
1413
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-hidden"
1514
attr="data.desktop_image.attributes"
16-
ko-style="Object.assign({}, data.desktop_image.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
15+
ko-style="Object.assign({}, data.desktop_image.style(), data.main.style(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
1716
css="data.desktop_image.css">
1817
<div class="pagebuilder-overlay"
1918
attr="data.overlay.attributes"
@@ -37,7 +36,7 @@
3736
</div>
3837
</div>
3938
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-only"
40-
ko-style="data.mobile_image.style"
39+
ko-style="Object.assign({}, data.mobile_image.style(), data.main.style())"
4140
attr="data.mobile_image.attributes"
4241
css="data.mobile_image.css">
4342
<div class="pagebuilder-overlay"

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

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

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
-->
77

88
<div attr="data.main.attributes"
9-
ko-style="data.main.style"
109
css="data.main.css">
1110
<a attr="data.link.attributes"
1211
ko-style="data.link.style"
1312
css="data.link.css">
1413
<div attr="data.desktop_image.attributes"
15-
ko-style="Object.assign({}, data.desktop_image.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
14+
ko-style="Object.assign({}, data.desktop_image.style(), data.main.style(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
1615
css="data.desktop_image.css"
1716
class="pagebuilder-slide-wrapper pagebuilder-mobile-hidden">
1817
<div class="pagebuilder-overlay"
@@ -37,7 +36,7 @@
3736
</div>
3837
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-only"
3938
attr="data.mobile_image.attributes"
40-
ko-style="data.mobile_image.style"
39+
ko-style="Object.assign({}, data.mobile_image.style(), data.main.style())"
4140
css="data.mobile_image.css">
4241
<div class="pagebuilder-overlay"
4342
attr="data.overlay.attributes"

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

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

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
-->
77

88
<div attr="data.main.attributes"
9-
ko-style="data.main.style"
109
css="data.main.css">
1110
<a attr="data.link.attributes"
1211
ko-style="data.link.style"
1312
css="data.link.css">
1413
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-hidden"
1514
attr="data.desktop_image.attributes"
16-
ko-style="data.desktop_image.style"
15+
ko-style="Object.assign(data.desktop_image.style(), data.main.style())"
1716
css="data.desktop_image.css">
1817
<div class="pagebuilder-overlay pagebuilder-poster-overlay"
1918
attr="data.overlay.attributes"
@@ -38,7 +37,7 @@
3837
</div>
3938
<div class="pagebuilder-slide-wrapper pagebuilder-mobile-only"
4039
attr="data.mobile_image.attributes"
41-
ko-style="data.mobile_image.style"
40+
ko-style="Object.assign(data.mobile_image.style(), data.main.style())"
4241
css="data.mobile_image.css">
4342
<div class="pagebuilder-overlay pagebuilder-poster-overlay"
4443
attr="data.overlay.attributes"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +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"
1211
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
1312
<div class="pagebuilder-slide-wrapper"
14-
ko-style="data.desktop_image.style"
13+
ko-style="Object.assign(data.desktop_image.style(), data.main.style())"
1514
event="{mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper}">
1615
<div class="pagebuilder-poster-overlay"
1716
attr="data.overlay.attributes"

0 commit comments

Comments
 (0)