Skip to content

Commit e4754a5

Browse files
anthoulaanthoula
committed
Merge branch 'MC-4318-slide-transparent-background-color-renders-incorrectly' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
2 parents 354311a + e8fdb48 commit e4754a5

File tree

6 files changed

+42
-2
lines changed

6 files changed

+42
-2
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@
6868
<data key="cmsPageLinkName" unique="suffix">cms-page-link-</data>
6969
<data key="value">Good Night!</data>
7070
</entity>
71+
<!-- Background Color -->
72+
<entity name="PageBuilderBannerBackgroundColor_Empty" type="pagebuilder_banner_background_color_property">
73+
<data key="name">Background Color</data>
74+
<data key="section">background</data>
75+
<data key="fieldName">background_color</data>
76+
<data key="stageValue">rgb(250, 250, 250)</data>
77+
</entity>
7178
<!-- Link -->
7279
<entity name="PageBuilderBannerLinkUrlProperty" type="pagebuilder_banner_linkUrl_property">
7380
<data key="name">Link</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@
4040
<data key="fieldName">min_height</data>
4141
<data key="value">300</data>
4242
</entity>
43+
<!-- Background Color -->
44+
<entity name="PageBuilderSlideItemBackgroundColor_Empty" type="pagebuilder_slide_item_background_color_property">
45+
<data key="name">Background Color</data>
46+
<data key="section">background</data>
47+
<data key="fieldName">background_color</data>
48+
<data key="stageValue">rgb(250, 250, 250)</data>
49+
</entity>
4350
<!-- Link -->
4451
<entity name="PageBuilderSlideItemLinkURL_Empty" type="pagebuilder_slide_item_link_url_property">
4552
<data key="name">Link</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,23 @@
594594
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage">
595595
<argument name="section" value="BannerOnBackend"/>
596596
</actionGroup>
597+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{BannerOnBackend.noBackgroundColor('1')}}&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabDefaultBackgroundColor"/>
598+
<assertEquals stepKey="assertDefaultBackgroundColor">
599+
<expectedResult type="string">{{PageBuilderBannerBackgroundColor_Empty.stageValue}}</expectedResult>
600+
<actualResult type="variable">grabDefaultBackgroundColor</actualResult>
601+
</assertEquals>
597602
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
598603
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
599604
<!-- Validate Stage After Save -->
600605
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
601606
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage2">
602607
<argument name="section" value="BannerOnBackend"/>
603608
</actionGroup>
609+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{BannerOnBackend.noBackgroundColor('1')}}&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabDefaultBackgroundColorAfterSave"/>
610+
<assertEquals stepKey="assertDefaultBackgroundColorAfterSave">
611+
<expectedResult type="string">{{PageBuilderBannerBackgroundColor_Empty.stageValue}}</expectedResult>
612+
<actualResult type="variable">grabDefaultBackgroundColorAfterSave</actualResult>
613+
</assertEquals>
604614
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
605615
<argument name="contentType" value="PageBuilderBannerContentType"/>
606616
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,11 @@
201201
<seeElement selector="{{SlideOnBackend.backgroundSize('1', PageBuilderBackgroundSize_Default.value)}}" stepKey="seeBackgroundSizeStage"/>
202202
<seeElement selector="{{SlideOnBackend.backgroundPosition('1', PageBuilderBackgroundPosition_Default.styleValue)}}" stepKey="seeBackgroundPositionStage"/>
203203
<seeElement selector="{{SlideOnBackend.backgroundRepeat('1', PageBuilderBackgroundRepeat_Default.styleValue)}}" stepKey="seeBackgroundRepeatStage"/>
204+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{SlideOnBackend.noBackgroundColor('1')}}&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabDefaultBackgroundColor"/>
205+
<assertEquals stepKey="assertDefaultBackgroundColor">
206+
<expectedResult type="string">{{PageBuilderSlideItemBackgroundColor_Empty.stageValue}}</expectedResult>
207+
<actualResult type="variable">grabDefaultBackgroundColor</actualResult>
208+
</assertEquals>
204209
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
205210
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
206211
<!-- Validate Stage After Save -->
@@ -210,6 +215,11 @@
210215
<seeElement selector="{{SlideOnBackend.backgroundSize('1', PageBuilderBackgroundSize_Default.value)}}" stepKey="seeBackgroundSizeStage2"/>
211216
<seeElement selector="{{SlideOnBackend.backgroundPosition('1', PageBuilderBackgroundPosition_Default.styleValue)}}" stepKey="seeBackgroundPositionStage2"/>
212217
<seeElement selector="{{SlideOnBackend.backgroundRepeat('1', PageBuilderBackgroundRepeat_Default.styleValue)}}" stepKey="seeBackgroundRepeatStage2"/>
218+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{SlideOnBackend.noBackgroundColor('1')}}&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabDefaultBackgroundColorAfterSave"/>
219+
<assertEquals stepKey="assertDefaultBackgroundColorAfterSave">
220+
<expectedResult type="string">{{PageBuilderSlideItemBackgroundColor_Empty.stageValue}}</expectedResult>
221+
<actualResult type="variable">grabDefaultBackgroundColorAfterSave</actualResult>
222+
</assertEquals>
213223
<!-- Validate Edit Panel After Save -->
214224
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
215225
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">

‎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;

0 commit comments

Comments
 (0)