pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: "Server Offline" should always win against "Please reload"

Browse source 
Nothing to reload if the server is offline, so show the offline message above
the reload one.
This commit is contained in:
Gina Häußge 2015-12-07 11:51:20 +01:00
parent 2b4a985d85
commit 5e96bd8b6a
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -110,6 +110,9 @@ as shown [in this short GIF](http://i.imgur.com/wp1j9bs.gif).
reported "HEAD" instead of "(detached" reported "HEAD" instead of "(detached"
* Fixed some path checks for systems with symlinked paths * Fixed some path checks for systems with symlinked paths
([#1051](https://github.com/foosel/OctoPrint/pull/1051)) ([#1051](https://github.com/foosel/OctoPrint/pull/1051))
* Fixed a bug causing the "Server Offline" overlay to pop _under_ the
"Please reload" overlay, which could lead to "Connection refused" browser
messages when clicking "Reload now" in the wrong moment.
([Commits](https://github.com/foosel/OctoPrint/compare/1.2.7...1.2.8)) ([Commits](https://github.com/foosel/OctoPrint/compare/1.2.7...1.2.8))

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

9
src/octoprint/static/less/octoprint.less
View file

@ -396,10 +396,17 @@ ul.dropdown-menu li a {
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 10001;
display: none; display: none;
} }
#offline_overlay {
z-index: 10002;
}
#reloadui_overlay {
z-index: 10001;
}
#offline_overlay_background, #offline_overlay_background,
#reloadui_overlay_background { #reloadui_overlay_background {
position: fixed; position: fixed;