Merge branch 'devel' into dev/pluginLifecycleMgmt
This commit is contained in:
commit
d5e7149f99
3 changed files with 2 additions and 3 deletions
1
src/octoprint/static/css/bootstrap-modal.css
vendored
1
src/octoprint/static/css/bootstrap-modal.css
vendored
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
.modal-open {
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -936,6 +936,6 @@ textarea.block {
|
|||
|
||||
.scrollable {
|
||||
height: 100%;
|
||||
overflow-y: scroll;
|
||||
overflow: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
Loading…
Reference in a new issue