From eaba933519961eabc85cd89ed5a1d208dca9bfa6 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 4 May 2016 17:07:42 -0400 Subject: [PATCH 1/1] Issue #428844 by AmrMostafa, taocode: Use JS to adjust layout (a fix for all margin/absolute/background problems) --- admin_menu.css | 2 +- admin_menu.js | 6 ++++++ admin_menu_toolbar/admin_menu_toolbar.css | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin_menu.css b/admin_menu.css index 52ae3ff..b64dc64 100644 --- a/admin_menu.css +++ b/admin_menu.css @@ -43,7 +43,7 @@ border-right: none; } body.admin-menu { - margin-top: 20px !important; + margin-top: 20px; } /* All lists */ diff --git a/admin_menu.js b/admin_menu.js index 2e28b55..91a675e 100644 --- a/admin_menu.js +++ b/admin_menu.js @@ -105,6 +105,12 @@ Drupal.behaviors.adminMenuMarginTop = { attach: function (context, settings) { if (!settings.admin_menu.suppress && settings.admin_menu.margin_top) { $('body:not(.admin-menu)', context).addClass('admin-menu'); + var $win = $(window, context); + if (typeof $win.on == 'function') { + $win.on('load resize',function(){ + $('body.admin-menu', context).css('margin-top',$('#admin-menu-wrapper').height()+'px'); + }); + } } } }; diff --git a/admin_menu_toolbar/admin_menu_toolbar.css b/admin_menu_toolbar/admin_menu_toolbar.css index a3e9f3e..fdf5674 100644 --- a/admin_menu_toolbar/admin_menu_toolbar.css +++ b/admin_menu_toolbar/admin_menu_toolbar.css @@ -11,7 +11,7 @@ /* Adjust margin/height */ html body.admin-menu { - margin-top: 29px !important; + margin-top: 29px; } html body.admin-menu-with-shortcuts { margin-top: 65px !important; -- 2.7.4.windows.1