Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2019-11-24 00:10:19 +0300
committerWilliam Desportes <williamdes@wdes.fr>2019-11-24 00:13:22 +0300
commit758bed849d3efa261566e9da780d2b53dce5ccb2 (patch)
treec140b81f0e2d2f8e1128691cd3b595a7934ab919 /js
parent8fbd20ba31dd55d73fb10bc9aad47de92cce6d84 (diff)
parent4f21a0b9fe560036f701108966727d21436fe824 (diff)
Merge #15581 - Fix panels on homescreen go underneath of floating menubar
Pull-request: #15581 Fixes: #15570 Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'js')
-rw-r--r--js/navigation.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/navigation.js b/js/navigation.js
index 4e43d8d726..7971d504e9 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1129,6 +1129,7 @@ var ResizeHandler = function () {
$('#pma_navigation').width(pos);
$('body').css('margin-' + this.left, pos + 'px');
// Issue #15127 : Adding fixed positioning to menubar
+ // Issue #15570 : Panels on homescreen go underneath of floating menubar
$('#floating_menubar')
.css('margin-' + this.left, $('#pma_navigation').width() + $('#pma_navigation_resizer').width())
.css(this.left, 0)
@@ -1138,6 +1139,8 @@ var ResizeHandler = function () {
'width': '100%',
'z-index': 99
})
+ .append($('#serverinfo'))
+ .append($('#topmenucontainer'));
// Allow the DOM to render, then adjust the padding on the body
setTimeout(function () {
$('body').css(