Skip to content

Commit

Permalink
Merge pull request #1515 from tvdeyen/fix-tinymce-fullscreen
Browse files Browse the repository at this point in the history
Maximize element window if tinymce is fullscreen
  • Loading branch information
tvdeyen authored Dec 4, 2018
2 parents da86e77 + 186fa8c commit 6465950
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
5 changes: 5 additions & 0 deletions app/assets/stylesheets/alchemy/elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
.elements-window-visible & {
transform: translate3d(0, 0, 0);
}

// Fix for Tinymce fullscreen window positioning issues (GH#1511)
.mce-fullscreen & {
width: calc(100vw - #{$collapsed-main-menu-width - $default-border-width});
}
}

#element_area {
Expand Down
20 changes: 2 additions & 18 deletions app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@
direction: ltr;
}

.mce-widget button {
}

.mce-container *[unselectable] {
user-select: none;
}
Expand Down Expand Up @@ -70,6 +67,8 @@
overflow: hidden;
height: 100%;
z-index: 100;
background: #fff;
border-radius: 0;

.mce-resizehandle {
display: none;
Expand Down Expand Up @@ -337,21 +336,6 @@ div.mce-tinymce-inline {
}
}

.mce-fullscreen {
border: 0;
padding: 0;
margin: 0;
overflow: hidden;
background: #fff;
height: 100%;
}

div.mce-fullscreen {
position: fixed;
top: 0;
left: 0;
}

#mce-modal-block {
opacity: 0;
position: fixed;
Expand Down

0 comments on commit 6465950

Please sign in to comment.