Add workarounds for bug 1705215

chrome/autohide_bookmarks_and_main_toolbars.css

@@ -88,6 +88,10 @@ See the above repository for updates as well as full license text. */
 :where(#titlebar,#tab-notification-deck,.global-notificationbox){
   -moz-box-ordinal-group: 0;
 }
+:root[BookmarksToolbarOverlapsBrowser] #navigator-toolbox-background{
+  margin-bottom: 0 !important;
+  z-index: auto !important;
+}
 /* Show when cursor is over popups/context-menus - cannot control which ones */
 /*
 #mainPopupSet:hover ~ box > toolbox > .browser-toolbar{

chrome/multi-row_bookmarks.css

@@ -8,6 +8,9 @@ See the above repository for updates as well as full license text. */
   --multirow-bmb-row-margin: 2px; /* Control how much spacing is between rows */
   max-height: none !important;
 }
+:root[BookmarksToolbarOverlapsBrowser] :where(#PersonalToolbar){
+  height: unset !important;
+}
 
 #PlacesToolbar > hbox:not(#PlacesToolbarDropIndicatorHolder){ 
   display: block;

chrome/multi-row_tabs_below_content.css

@@ -227,7 +227,15 @@ See the above repository for updates as well as full license text. */
   :root:not([customizing]) #TabsToolbar #new-tab-button,
   #tabbrowser-arrowscrollbox > spacer,
   .tabbrowser-tab::after{ display: none !important } /* Also disables tab separators since they mysteriously break tab-row scrolling */
-  
+  :root[BookmarksToolbarOverlapsBrowser] #PersonalToolbar{
+    position: absolute;
+    top: calc(var(--multirow-toolbar-height) + var(--multirow-top-padding));
+    width: 100vw;
+  }
+  :root[BookmarksToolbarOverlapsBrowser] #navigator-toolbox-background{
+    margin-bottom: 0 !important;
+    z-index: auto !important;
+  }
   @supports -moz-bool-pref("userchrome.multirowtabs.static-menubar.enabled"){
     :root{
       --multirow-menubar-height: 28px;
@@ -241,5 +249,8 @@ See the above repository for updates as well as full license text. */
     :root:not([inFullscreen]) #nav-bar{
       top: calc(var(--multirow-menubar-height) + var(--multirow-top-padding));
     }
+    :root[BookmarksToolbarOverlapsBrowser] #PersonalToolbar{
+      top: calc(var(--multirow-toolbar-height) + var(--multirow-top-padding) + var(--multirow-menubar-height));
+    }
   }
 }

chrome/toolbars_below_content.css

@@ -63,6 +63,13 @@ See the above repository for updates as well as full license text. */
   #main-window > body > box{ margin-top: 0 !important; }
   #toolbar-menubar{ z-index: 1; background-color: var(--lwt-accent-color,black); }
   
+  :root[BookmarksToolbarOverlapsBrowser] #navigator-toolbox-background{
+    margin-block: calc(-1 * var(--bookmarks-toolbar-height)) 0 !important;
+  }
+  :root[BookmarksToolbarOverlapsBrowser] .newTabBrowserPanel{
+    padding-block: 0 var(--bookmarks-toolbar-height) !important;
+  }
+  
   /**************
   Menubar options - By default, menubar is overlayed on top of web-content
   ***************/