Skip to content

Commit ac3ba64

Browse files
committed
MC-4116: Update slider to use new background images logic
- fix inline wysiwyg menu position
1 parent 17a38b8 commit ac3ba64

File tree

6 files changed

+35
-15
lines changed

6 files changed

+35
-15
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,22 @@
77
// Collage center appearance styles
88
// _____________________________________________
99

10-
.pagebuilder-slide.pagebuilder-collage-centered {
10+
.pagebuilder-slide[data-appearance='collage-centered'] {
1111
.pagebuilder-overlay {
1212
-moz-transition: background-color 500ms ease;
1313
-o-transition: background-color 500ms ease;
1414
-webkit-transition: background-color 500ms ease;
1515
margin-left: auto;
1616
margin-right: auto;
1717
transition: background-color 500ms ease;
18+
19+
&.wysiwyg-container {
20+
.mce-tinymce-inline {
21+
left: 29px !important;
22+
right: 29px;
23+
top: 30px !important;
24+
}
25+
}
1826
}
1927
}
2028

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
// Collage left appearance styles
88
// _____________________________________________
99

10-
.pagebuilder-slide .pagebuilder-overlay {
11-
-moz-transition: background-color 500ms ease;
12-
-o-transition: background-color 500ms ease;
13-
-webkit-transition: background-color 500ms ease;
14-
transition: background-color 500ms ease;
10+
.pagebuilder-slide[data-appearance='collage-left'] {
11+
.pagebuilder-overlay {
12+
-moz-transition: background-color 500ms ease;
13+
-o-transition: background-color 500ms ease;
14+
-webkit-transition: background-color 500ms ease;
15+
transition: background-color 500ms ease;
16+
17+
&.wysiwyg-container {
18+
.mce-tinymce-inline {
19+
left: 29px !important;
20+
right: 29px;
21+
top: 30px !important;
22+
}
23+
}
24+
}
1525
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
// Collage right appearance styles
88
// _____________________________________________
99

10-
.pagebuilder-slide.pagebuilder-collage-right {
10+
.pagebuilder-slide[data-appearance='collage-right'] {
1111
.pagebuilder-overlay {
1212
-moz-transition: background-color 500ms ease;
1313
-o-transition: background-color 500ms ease;
1414
-webkit-transition: background-color 500ms ease;
1515
margin-left: auto;
1616
transition: background-color 500ms ease;
1717

18-
.wysiwyg-container {
18+
&.wysiwyg-container {
1919
.mce-tinymce-inline {
20-
left: unset !important;
20+
left: 29px !important;
21+
right: 29px;
22+
top: 30px !important;
2123
}
2224
}
2325
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
}
5555
}
5656
.mce-tinymce-inline {
57-
left: -2px !important;
58-
padding: 5px !important;
59-
right: -2px;
60-
top: -1px !important;
57+
left: -1px !important;
58+
padding: 5px;
59+
right: -1px;
60+
top: 0;
6161
}
6262
.pagebuilder-empty-slide {
6363
left: 0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-content-type pagebuilder-slide pagebuilder-collage-centered"
8+
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<div class="pagebuilder-content-type pagebuilder-slide pagebuilder-collage-right"
8+
<div class="pagebuilder-content-type pagebuilder-slide"
99
attr="data.main.attributes"
1010
css="data.main.css"
1111
event="{ mouseover: onMouseOver, mouseout: onMouseOut }">

0 commit comments

Comments
 (0)