Skip to content

Commit 95a447b

Browse files
committed
fix(tinymce): Do not exceed height of element window
and use the correct colors for the overflowing toolbar. (cherry picked from commit 1035dc3)
1 parent 74722ee commit 95a447b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

app/assets/builds/tinymce/skins/ui/alchemy-dark/skin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/tinymce/skins/ui/alchemy/skin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/stylesheets/tinymce/skins/ui/alchemy-dark/skin.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,7 +2445,7 @@ body.tox-dialog__disable-scroll {
24452445

24462446
.tox-fullscreen {
24472447
border: 0;
2448-
height: 100%;
2448+
height: 100% !important;
24492449
margin: 0;
24502450
overflow: hidden;
24512451
-ms-scroll-chaining: none;
@@ -3630,7 +3630,7 @@ body.tox-dialog__disable-scroll {
36303630
}
36313631

36323632
.tox.tox-tinymce-aux .tox-toolbar__overflow {
3633-
background-color: #fff;
3633+
background-color: var(--a-darker-grey);
36343634
border: var(--border-default);
36353635
border-radius: var(--border-radius_medium);
36363636
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);

app/stylesheets/tinymce/skins/ui/alchemy/skin.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2445,7 +2445,7 @@ body.tox-dialog__disable-scroll {
24452445

24462446
.tox-fullscreen {
24472447
border: 0;
2448-
height: 100%;
2448+
height: 100% !important;
24492449
margin: 0;
24502450
overflow: hidden;
24512451
-ms-scroll-chaining: none;
@@ -3631,7 +3631,7 @@ body.tox-dialog__disable-scroll {
36313631
}
36323632

36333633
.tox.tox-tinymce-aux .tox-toolbar__overflow {
3634-
background-color: #fff;
3634+
background-color: var(--color-grey_very_light);
36353635
border: var(--border-default);
36363636
border-radius: var(--border-radius_medium);
36373637
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);

0 commit comments

Comments
 (0)