Skip to content

Commit 5e81471

Browse files
author
Hwashiang Yu
committed
MC-4318: Slide Transparent Background Color Renders Incorrectly & Inconsistently On Stage & Storefront
- Updated slide collage templates to have an additional class for putting on default background color - Updated backend styling for slide and banner - Updated test sections for default background color style on backend
1 parent 6cd8656 commit 5e81471

File tree

7 files changed

+16
-7
lines changed

7 files changed

+16
-7
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<element name="backgroundRepeat" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
100100
<element name="backgroundAttachment" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
101101
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
102-
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
102+
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: #fafafa;')]" parameterized="true"/>
103103
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
104104
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
105105
<!-- Content Configuration -->

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<element name="mobileMinimumHeight" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
7979
<!-- Background Configuration -->
8080
<element name="backgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
81-
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
81+
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: #fafafa;')]" parameterized="true"/>
8282
<element name="backgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
8383
<element name="noBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
8484
<element name="backgroundPosition" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
// _____________________________________________
99

1010
.pagebuilder-banner {
11-
background-color: @color-gray98;
1211
cursor: text;
1312

13+
.pagebuilder-banner-wrapper {
14+
background-color: @color-gray98;
15+
}
16+
1417
.pagebuilder-overlay {
1518
-moz-transition: background-color 500ms ease;
1619
-o-transition: background-color 500ms ease;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
// _____________________________________________
99

1010
.pagebuilder-slide {
11-
background-color: @color-gray98;
1211
cursor: text;
1312

13+
.pagebuilder-slide-wrapper {
14+
background-color: @color-gray98;
15+
}
16+
1417
.pagebuilder-empty-slide {
1518
color: @color-gray65-lighten;
1619
font-size: 14px;

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
@@ -9,7 +9,8 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
12+
<div class="pagebuilder-slide-wrapper"
13+
ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(25% + ' + data.desktop_image.style().paddingLeft + ')', paddingRight: 'calc(25% + ' + data.desktop_image.style().paddingRight + ')'})"
1314
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1415
<scope args="getUploader().getUiComponent()">
1516
<render />

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
@@ -9,7 +9,8 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
12+
<div class="pagebuilder-slide-wrapper"
13+
ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingRight: 'calc(50% + ' + data.desktop_image.style().paddingRight + ')'})"
1314
css="data.main.css"
1415
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1516
<scope args="getUploader().getUiComponent()">

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
@@ -9,7 +9,8 @@
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">
12-
<div ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
12+
<div class="pagebuilder-slide-wrapper"
13+
ko-style="Object.assign(data.main.style(), data.desktop_image.styleNoReset(), {paddingLeft: 'calc(50% + ' + data.desktop_image.style().paddingLeft + ')'})"
1314
event="mouseover: onMouseOverWrapper, mouseout: onMouseOutWrapper, mousedown: activateEditor">
1415
<scope args="getUploader().getUiComponent()">
1516
<render />

0 commit comments

Comments
 (0)