Skip to content

Commit

Permalink
css: Fix last commit overflow should not apply to inner-editors (ethe…
Browse files Browse the repository at this point in the history
…r#3914)

* css: Fix last commit overflow should not apply to inner-editors

* css: hide toolbar popup and nice-select when clicking on pad
  • Loading branch information
seballot authored Apr 21, 2020
1 parent 7ec3be6 commit 51d924c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/static/css/pad/form.css
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ select, .nice-select {
.nice-select .option:hover,.nice-select .option.focus,.nice-select .option.selected.focus {
background-color: #f6f6f6;
}
.nice-select .option[data-value="dummy"] {
display: none;
}
.nice-select .option.selected {
font-weight: bold;
}
Expand Down
4 changes: 3 additions & 1 deletion src/static/css/pad/layout.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
html, body {
width: 100%;
height: 100%;
overflow: hidden;
margin: 0;
padding: 0;
}
html:not(.inner-editor), html:not(.inner-editor) body {
overflow: hidden;
}
body {
display: flex;
flex-direction: column;
Expand Down
8 changes: 5 additions & 3 deletions src/static/js/pad_editbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ var padeditbar = (function()
return;
}

$('.nice-select').removeClass('open');
$('.toolbar-popup').removeClass("popup-show");

// hide all modules and remove highlighting of all buttons
if(moduleName == "none")
{
Expand All @@ -235,13 +238,12 @@ var padeditbar = (function()
var isAForceReconnectMessage = module.find('button#forcereconnect:visible').length > 0;
if(isAForceReconnectMessage)
continue;

if(module.css('display') != "none")
{
if (module.hasClass('popup-show')) {
$("li[data-key=" + thisModuleName + "] > a").removeClass("selected");
module.removeClass("popup-show");
}
}

if(!returned && cb) return cb();
}
else
Expand Down

0 comments on commit 51d924c

Please sign in to comment.