diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js index a6c14d61a69e..1e48295d54ab 100644 --- a/apps/system/js/statusbar.js +++ b/apps/system/js/statusbar.js @@ -117,11 +117,11 @@ var StatusBar = { /* For other modules to acquire */ get height() { - if (this.screen.classList.contains('fullscreen-app') || + if (this.screen.classList.contains('active-statusbar')) { + return this.attentionBar.offsetHeight; + } else if (this.screen.classList.contains('fullscreen-app') || document.mozFullScreen) { return 0; - } else if (this.screen.classList.contains('active-statusbar')) { - return this.attentionBar.offsetHeight; } else { return this._cacheHeight || (this._cacheHeight = this.element.getBoundingClientRect().height); diff --git a/apps/system/style/attention_screen.css b/apps/system/style/attention_screen.css index 126d52ed9dc6..45f52640862b 100644 --- a/apps/system/style/attention_screen.css +++ b/apps/system/style/attention_screen.css @@ -23,6 +23,10 @@ transition: none; } +#screen.attention.active-statusbar #statusbar { + display: none; +} + #attention-screen.status-mode > iframe { margin-top: 0; height: 100%; diff --git a/apps/system/style/system/system.css b/apps/system/style/system/system.css index 30ad9d7ab40d..7041da8ce11b 100644 --- a/apps/system/style/system/system.css +++ b/apps/system/style/system/system.css @@ -260,8 +260,10 @@ body { border: none; } -#screen.active-statusbar #windows > .appWindow { - top: 40px; +#screen.active-statusbar #windows > .appWindow, +#screen.active-statusbar #windows > .appWindow.fullscreen-app { + top: 4rem; + height: calc(100% - 4rem); } #windows > .appWindow:not(.homescreen) {