Commit f3bf0846 authored by pom2ter's avatar pom2ter

[FIX] fix alignment of 'monitor this page' checkbox when editing a wiki page in fullscreen

parent bc61f4bd
Pipeline #37617086 failed with stages
in 42 minutes and 27 seconds
......@@ -603,7 +603,7 @@ syntaxHighlighter = {
//removes wiki command buttons (save, cancel, preview) from fullscreen view
$('.CodeMirror-fullscreen .actions').remove();
textarea.parent().toggleClass('CodeMirror-fullscreen');
textarea.parent().parent().toggleClass('CodeMirror-fullscreen');
$('body').toggleClass('noScroll');
$('.tabs,.rbox-title, .modules').toggle();
......@@ -613,20 +613,22 @@ syntaxHighlighter = {
screen = $('.CodeMirror-fullscreen'),
editorObj = screen.find('.CodeMirror'),
toolbar = $('#editwiki_toolbar');
editzonefooter = $('.CodeMirror-fullscreen .edit-zone-footer');
if (isFullscreen) {
editorObj.resizable( "disable" );
//adds wiki command buttons (save, cancel, preview) from fullscreen view
$('.actions', '#col1').clone().appendTo('.CodeMirror-fullscreen');
var actions = $('.CodeMirror-fullscreen .actions');
win.resize(function () {
if (win.data('cm-resize') && screen) {
screen.css('height', win.height() + 'px');
editorObj.height(win.height() - toolbar.height());
editorObj.height(win.height() - toolbar.height() - editzonefooter.outerHeight() - actions.outerHeight());
}
}).resize();
//adds wiki command buttons (save, cancel, preview) from fullscreen view
$('.actions', '#col1').clone().appendTo('.CodeMirror-fullscreen');
} else {
editorObj.resizable( "enable" );
$(window).removeData('cm-resize');
......
......@@ -755,7 +755,7 @@ function toggleFullScreen(area_id) {
actions.clone().appendTo('.TextArea-fullscreen');
actions = $('.actions', $('.TextArea-fullscreen'));
comment.css({ // fix comments fieldset to bottom and hide others (like contributions)
comment.css({ // fix comments fieldset to bottom and hide others (like contributions)
position: "absolute",
bottom: actions.outerHeight() + "px",
width: "100%"
......@@ -774,7 +774,7 @@ function toggleFullScreen(area_id) {
if (win.data('cm-resize') && screen) {
screen.css('height', win.height() + 'px');
var swidth = win.width() + "px";
var commentMargin = parseInt(comment.css("marginBottom").replace("px", "")) * 2;
var commentMargin = parseInt(comment.css("paddingTop").replace("px", "")) * 4;
commentMargin += parseInt(comment.css("borderBottomWidth").replace("px", "")) * 2;
var innerHeight = win.height() - comment.outerHeight() - commentMargin - actions.outerHeight();
// reducing innerHeight by 85px in prev line makes the "Describe the change you made:" and
......
......@@ -6462,8 +6462,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #555; }
.TextArea-fullscreen {
background-color: #555; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #108a93; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #108a93;
......
......@@ -496,8 +496,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......@@ -3865,8 +3865,18 @@ li .url-group {
position: absolute !important;
width: 100% !important; }
.TextArea-fullscreen .edit-zone-footer {
background: #fff; }
.TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
position: absolute;
margin: 0 !important;
padding: 4px 12px 12px;
width: 100%;
bottom: 49px;
z-index: 2; }
.TextArea-fullscreen .edit-zone-footer .form-check, .CodeMirror-fullscreen .edit-zone-footer .form-check {
position: absolute;
padding: 4px 12px 12px;
bottom: 49px;
right: 0; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
bottom: 0 !important;
......
......@@ -797,8 +797,11 @@ body.wikitext {
}
// /* Fullscreen textareas */
.TextArea-fullscreen {
background-color: $gray-500;
.TextArea-fullscreen,
.CodeMirror-fullscreen {
&, & .edit-zone-footer {
background-color: $body-bg;
}
}
.TextArea-fullscreen .actions,
......
......@@ -634,8 +634,21 @@ li .url-group {
width: 100% !important;
}
.TextArea-fullscreen .edit-zone-footer {
background: $body-bg;
.TextArea-fullscreen .edit-zone-footer,
.CodeMirror-fullscreen .edit-zone-footer {
position: absolute;
margin: 0 !important;
padding: 4px 12px 12px;
width: 100%;
bottom: 49px;
z-index: 2;
.form-check {
position: absolute;
padding: 4px 12px 12px;
bottom: 49px;
right: 0;
}
}
.TextArea-fullscreen .actions,
......
......@@ -6448,8 +6448,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #737373; }
.TextArea-fullscreen {
background-color: #737373; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6457,8 +6457,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6309,8 +6309,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6561,8 +6561,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #888; }
.TextArea-fullscreen {
background-color: #888; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #060606; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #060606;
......
......@@ -6537,8 +6537,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #222; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #222;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #474747; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #474747;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #90140c; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #90140c;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6474,8 +6474,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #e6f3f6; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #e6f3f6;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6516,8 +6516,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6527,8 +6527,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #b4bcc2; }
.TextArea-fullscreen {
background-color: #b4bcc2; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6448,8 +6448,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #addd63; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #addd63;
......
......@@ -6479,8 +6479,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #aaa; }
.TextArea-fullscreen {
background-color: #aaa; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6474,8 +6474,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #f0f0f0; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #f0f0f0;
......
......@@ -6561,8 +6561,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6641,8 +6641,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6527,8 +6527,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -7261,8 +7261,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #bbb; }
.TextArea-fullscreen {
background-color: #bbb; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6552,8 +6552,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #aaa; }
.TextArea-fullscreen {
background-color: #aaa; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6447,8 +6447,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #242424; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #242424;
......
......@@ -6522,8 +6522,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6526,8 +6526,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #98978b; }
.TextArea-fullscreen {
background-color: #98978b; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6548,8 +6548,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fcfcfc; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fcfcfc;
......
......@@ -6673,8 +6673,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #aaa; }
.TextArea-fullscreen {
background-color: #aaa; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6697,8 +6697,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #999; }
.TextArea-fullscreen {
background-color: #999; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #272b30; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #272b30;
......
......@@ -6499,8 +6499,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #002b36; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #002b36;
......
......@@ -6578,8 +6578,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #999; }
.TextArea-fullscreen {
background-color: #999; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6448,8 +6448,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #214d68; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #214d68;
......
......@@ -6548,8 +6548,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #2b3e50; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #2b3e50;
......
......@@ -6448,8 +6448,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6448,8 +6448,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #f4f4f4; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #f4f4f4;
......
......@@ -6449,8 +6449,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #f6f6f6; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #f6f6f6;
......
......@@ -6460,8 +6460,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #aea79f; }
.TextArea-fullscreen {
background-color: #aea79f; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
......@@ -6452,8 +6452,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #eee; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #eee;
......
......@@ -6651,8 +6651,8 @@ body.wikitext {
.admintoclevel .actions input {
border: solid 1px #adb5bd; }
.TextArea-fullscreen {
background-color: #adb5bd; }
.TextArea-fullscreen, .CodeMirror-fullscreen, .TextArea-fullscreen .edit-zone-footer, .CodeMirror-fullscreen .edit-zone-footer {
background-color: #fff; }
.TextArea-fullscreen .actions, .CodeMirror-fullscreen .actions {
background-color: #fff;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment