MC-4117: Update banner to use new background images logic

anthoula · anthoula · commit 1c3dd10afeea · 2018-10-10T12:16:20.000-05:00
- fix overlay when rendered in block on stage
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less
@@ -24,16 +24,11 @@
 //  Collage center appearance styles rendered through Block
 //  _______________________________________________________
 
-
-[data-appearance='collage-centered'] {
+[data-role='banner'][data-appearance='collage-centered'] {
     .pagebuilder-banner-wrapper {
         .pagebuilder-overlay {
             margin-left: auto;
             margin-right: auto;
-
-            .pagebuilder-collage-content {
-                padding: 30px;
-            }
         }
     }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-left.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-left.less
@@ -12,13 +12,3 @@
         padding: 35px 20px;
     }
 }
-
-//
-//  Collage left appearance styles rendered through Block
-//  _____________________________________________________
-
-[data-appearance='collage-left'] {
-    .pagebuilder-collage-content {
-        padding: 30px;
-    }
-}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less
@@ -23,13 +23,8 @@
 //  Collage right appearance styles rendered through Block
 //  ______________________________________________________
 
-
-[data-appearance='collage-right'] {
+[data-role='banner'][data-appearance='collage-right'] {
     .pagebuilder-overlay {
         margin-left: auto;
-
-        .pagebuilder-collage-content {
-            padding: 30px;
-        }
     }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less
@@ -45,6 +45,7 @@
             right: 0;
             z-index: 20;
         }
+
         > .mce-content-body {
             min-height: 50px;
             padding: 5px 20px !important;
@@ -57,6 +58,7 @@
                 top: -45px;
             }
         }
+
         > .mce-edit-focus {
             ~ .placeholder-text {
                 display: none;
@@ -107,6 +109,6 @@
     }
 
     .pagebuilder-banner-button {
-        margin: 20px 0 0 0;
+        margin: @margin 0 0 0;
     }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less
@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 .pagebuilder-banner-wrapper {
-
     .pagebuilder-poster-content {
         text-align: center;
         width: 100%;

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,11 @@`
`24`	`24`	`// Collage center appearance styles rendered through Block`
`25`	`25`	`// _______________________________________________________`
`26`	`26`
`27`		`-`
`28`		`-[data-appearance='collage-centered'] {`
	`27`	`+[data-role='banner'][data-appearance='collage-centered'] {`
`29`	`28`	`.pagebuilder-banner-wrapper {`
`30`	`29`	`.pagebuilder-overlay {`
`31`	`30`	`margin-left: auto;`
`32`	`31`	`margin-right: auto;`
`33`		`-`
`34`		`- .pagebuilder-collage-content {`
`35`		`- padding: 30px;`
`36`		`- }`
`37`	`32`	`}`
`38`	`33`	`}`
`39`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,3 @@`
`12`	`12`	`padding: 35px 20px;`
`13`	`13`	`}`
`14`	`14`	`}`
`15`		`-`
`16`		`-//`
`17`		`-// Collage left appearance styles rendered through Block`
`18`		`-// _____________________________________________________`
`19`		`-`
`20`		`-[data-appearance='collage-left'] {`
`21`		`- .pagebuilder-collage-content {`
`22`		`- padding: 30px;`
`23`		`- }`
`24`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,8 @@`
`23`	`23`	`// Collage right appearance styles rendered through Block`
`24`	`24`	`// ______________________________________________________`
`25`	`25`
`26`		`-`
`27`		`-[data-appearance='collage-right'] {`
	`26`	`+[data-role='banner'][data-appearance='collage-right'] {`
`28`	`27`	`.pagebuilder-overlay {`
`29`	`28`	`margin-left: auto;`
`30`		`-`
`31`		`- .pagebuilder-collage-content {`
`32`		`- padding: 30px;`
`33`		`- }`
`34`	`29`	`}`
`35`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`right: 0;`
`46`	`46`	`z-index: 20;`
`47`	`47`	`}`
	`48`	`+`
`48`	`49`	`> .mce-content-body {`
`49`	`50`	`min-height: 50px;`
`50`	`51`	`padding: 5px 20px !important;`
`@@ -57,6 +58,7 @@`
`57`	`58`	`top: -45px;`
`58`	`59`	`}`
`59`	`60`	`}`
	`61`	`+`
`60`	`62`	`> .mce-edit-focus {`
`61`	`63`	`~ .placeholder-text {`
`62`	`64`	`display: none;`
`@@ -107,6 +109,6 @@`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`.pagebuilder-banner-button {`
`110`		`- margin: 20px 0 0 0;`
	`112`	`+ margin: @margin 0 0 0;`
`111`	`113`	`}`
`112`	`114`	`}`