Skip to content

Commit 5f2482f

Browse files
author
Hwashiang Yu
committed
MC-5383: Option Menus, Heading Inline Editor & tinyMCE Inline Editor Are Cut Off on Full Screen View
- Implemented fix to tinymce4 toolbar animation - Implemented tooltip in column toolbar overflow styling and logic - Implemented live edit toolbar overflow styling and logic - Implemented options men u overflow right side styling and logic
1 parent 86f2b2f commit 5f2482f

File tree

19 files changed

+222
-117
lines changed

19 files changed

+222
-117
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
pointer-events: none;
2222
position: absolute;
2323
transform: translateY(0);
24-
transition: transform 100ms, opacity 400ms, visibility 400ms;
24+
transition: transform 200ms, opacity 200ms, visibility 200ms;
2525
visibility: hidden;
2626
width: auto !important;
2727

@@ -42,9 +42,6 @@
4242
opacity: 1;
4343
pointer-events: all;
4444
visibility: visible !important;
45-
&.transform-up {
46-
transform: translateY(-100%);
47-
}
4845
}
4946
}
5047
&._right-aligned-toolbar ~ div.mce-tinymce-inline {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.pagebuilder-canvas {
78-
padding-top: 50px;
78+
padding-top: 30px;
7979
}
8080

8181
.pagebuilder-panel-wrapper {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_toolbar.less

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
}
1919

2020
.pagebuilder-toolbar-options {
21-
bottom: 100%;
2221
opacity: 1;
2322
transition-delay: 200ms;
2423
visibility: visible;
@@ -30,16 +29,15 @@
3029
}
3130

3231
.pagebuilder-toolbar-options {
33-
-moz-transition: opacity 200ms, top 200ms, visibility 200ms;
34-
-o-transition: opacity 200ms, top 200ms, visibility 200ms;
35-
-webkit-transition: opacity 200ms, top 200ms, visibility 200ms;
32+
-moz-transition: transform 200ms, opacity 200ms, visibility 200ms;
33+
-o-transition: transform 200ms, opacity 200ms, visibility 200ms;
34+
-webkit-transition: transform 200ms, opacity 200ms, visibility 200ms;
3635
background-color: @color-gray94;
3736
border: 1px solid @color-gray75;
38-
bottom: 0;
3937
left: -2px;
4038
opacity: 0;
4139
position: absolute;
42-
transition: bottom 200ms, opacity 200ms, visibility 200ms;
40+
transition: transform 200ms, opacity 200ms, visibility 200ms;
4341
visibility: hidden;
4442
width: calc(~'100% + 4px');
4543
z-index: 32;
@@ -58,7 +56,6 @@
5856
&:not(:first-child):before {
5957
background-color: @color-light-gray;
6058
content: '';
61-
height: 80%;
6259
left: 0;
6360
position: relative;
6461
top: 10%;

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,24 +324,33 @@
324324
}
325325

326326
.pagebuilder-options {
327-
-moz-transition: opacity 200ms, visibility 200ms;
328-
-o-transition: opacity 200ms, visibility 200ms;
329-
-webkit-transition: opacity 200ms, visibility 200ms;
330327
height: 40px;
331-
left: 50%;
332328
opacity: 0;
333329
position: absolute;
330+
right: 0;
334331
text-align: center;
335332
top: 0;
336-
transform: translate(-50%, -50%);
333+
transform: translate(0, -50%);
334+
-moz-transition: opacity 200ms, visibility 200ms;
335+
-o-transition: opacity 200ms, visibility 200ms;
336+
-webkit-transition: opacity 200ms, visibility 200ms;
337337
transition: opacity 200ms, visibility 200ms;
338338
visibility: hidden;
339339
z-index: 105;
340340

341+
&.pagebuilder-options-middle {
342+
right: 50%;
343+
transform: translate(50%, -50%);
344+
}
345+
341346
&.pagebuilder-options-visible {
342-
.pagebuilder-options-visible;
347+
opacity: 1;
348+
transition-delay: 200ms;
349+
visibility: visible;
343350
}
344351

352+
353+
345354
.pagebuilder-options-wrapper {
346355
background: @color-white;
347356
border: 1px solid rgba(153, 153, 153, .7);

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
bottom: 175%;
292292
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
293293
font-size: 14px;
294-
left: -390%;
294+
left: -200%;
295295
padding: .9rem 1.8rem;
296296
position: absolute;
297297
text-align: left;
@@ -305,7 +305,7 @@
305305
content: '';
306306
display: block;
307307
height: 0;
308-
left: 87.5%;
308+
left: 70.5%;
309309
margin-left: -.8rem;
310310
position: absolute;
311311
top: 100%;
@@ -320,6 +320,26 @@
320320
border-top-color: @color-lazy-sun;
321321
z-index: 4;
322322
}
323+
324+
&.tooltip-down {
325+
bottom: -490%;
326+
327+
&:before,
328+
&:after {
329+
top: -25%;
330+
}
331+
&:before {
332+
border-bottom-color: @color-lazy-sun;
333+
border-top-color: transparent;
334+
margin-top: 1px;
335+
z-index: 4;
336+
}
337+
&:after {
338+
border-bottom-color: @color-dark-grayish-orange;
339+
border-top-color: transparent;
340+
z-index: 3;
341+
}
342+
}
323343
}
324344

325345
.grid-panel-tooltip:hover > .tooltip-content {

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

Lines changed: 35 additions & 4 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/js/content-type/column-group/preview.js

Lines changed: 11 additions & 1 deletion
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/js/content-type/preview.js

Lines changed: 11 additions & 0 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/js/utils/check-stage-full-screen.js

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

0 commit comments

Comments
 (0)