X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=css%2Fmenubar-drupal8.css;h=c143dc967f130e30c4501f7c61df07c73bcd4dfc;hb=9cbdbf090d52017cbb9653f39a34279d28e9161a;hp=868a7864dad005731fadb6116131b286f7bf90c3;hpb=fa7827acaf8009256ebf794e41a8799d98ad149f;p=civicrm-core.git

diff --git a/css/menubar-drupal8.css b/css/menubar-drupal8.css
index 868a7864da..c143dc967f 100644
--- a/css/menubar-drupal8.css
+++ b/css/menubar-drupal8.css
@@ -24,21 +24,24 @@ nav#civicrm-menu-nav .crm-menubar-toggle-btn-icon {
   left: 44px;
 }
 
-@media (min-width: 768px) {
+@media (min-width: $breakMin) {
 
-  body.crm-menubar-visible.crm-menubar-over-cms-menu #toolbar-administration  {
+  body.crm-menubar-visible.crm-menubar-over-cms-menu #toolbar-administration {
     display: none;
   }
 
   body.crm-menubar-visible.crm-menubar-over-cms-menu {
-    padding-top: 40px !important;
+    padding-top: $menubarHeight !important;
   }
-  body.crm-menubar-visible.crm-menubar-over-cms-menu.crm-menubar-wrapped,
+  body.crm-menubar-visible.crm-menubar-over-cms-menu.crm-menubar-wrapped {
+    padding-top: calc($menubarHeight * 2) !important;
+  }
+  /* The Drupal menu is 40px tall so we add that to our menubar height */
   body.crm-menubar-visible.crm-menubar-below-cms-menu {
-    padding-top: 80px !important;
+    padding-top: calc($menubarHeight + 40px) !important;
   }
   body.crm-menubar-visible.crm-menubar-below-cms-menu.crm-menubar-wrapped {
-    padding-top: 120px !important;
+    padding-top: calc($menubarHeight * 2 + 40px) !important;
   }
 
   body.crm-menubar-below-cms-menu > #civicrm-menu-nav ul#civicrm-menu {