From fe534d622483ef7a95b37bcd2725be75ec31345d Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Sat, 6 Nov 2021 22:23:29 +0200
Subject: [PATCH] make #tab-notification-deck always be closest "toolbar" to
 content

---
 chrome/multi-row_tabs_below_content.css |  5 ++++-
 chrome/tabs_on_bottom.css               |  4 ++--
 chrome/toolbars_below_content.css       | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/chrome/multi-row_tabs_below_content.css b/chrome/multi-row_tabs_below_content.css
index 3315794..ddb768e 100644
--- a/chrome/multi-row_tabs_below_content.css
+++ b/chrome/multi-row_tabs_below_content.css
@@ -28,11 +28,13 @@ See the above repository for updates as well as full license text. */
   @media (-moz-os-version: windows-win7),(-moz-os-version: windows-win10){
     :root[sizemode="maximized"]{ --multirow-top-padding: 8px }
   }
-  :root[uidensity="compact"]{--multirow-toolbar-height: 32px}
+  :root[uidensity="compact"]{--multirow-toolbar-height: 34px}
   :root{ border-top-width: 0px !important }
 
   #main-window > body > box,
   #navigator-toolbox{ -moz-box-ordinal-group: 2; border-bottom: 0px !important }
+  
+  #tab-notification-deck{ -moz-box-ordinal-group: 0 }
 
   #titlebar{-moz-appearance: none !important; } /* Try setting to "-moz-window-titlebar" if you face issues */
 
@@ -45,6 +47,7 @@ See the above repository for updates as well as full license text. */
     width: calc(100vw - 30px);
     top: var(--multirow-top-padding);
   }
+  #nav-bar-customization-target{ -webkit-box-flex: 1 }
   :root[inFullscreen] #nav-bar,
   :root[tabsintitlebar] #nav-bar{
     margin-right: 138px;
diff --git a/chrome/tabs_on_bottom.css b/chrome/tabs_on_bottom.css
index 24405f3..31abed1 100644
--- a/chrome/tabs_on_bottom.css
+++ b/chrome/tabs_on_bottom.css
@@ -46,8 +46,8 @@ linux_gtk_window_control_patch.css
   -moz-appearance: none !important;
   --tabs-navbar-shadow-size: 0px;
 }
+#tab-notification-deck{ -moz-box-ordinal-group: 2 }
 
-.titlebar-placeholder,
 #TabsToolbar .titlebar-spacer{ display: none; }
 /* Also hide the toolbox bottom border which isn't at bottom with this setup */
 #navigator-toolbox::after{ display: none !important; }
@@ -60,7 +60,7 @@ toolbox#navigator-toolbox > toolbar#nav-bar.browser-toolbar{ animation: none; }
 #TabsToolbar > .titlebar-buttonbox-container{ visibility: visible }
 #navigator-toolbox:not(:-moz-lwtheme){ background-color: -moz-dialog }
 
-/* Uncomment the following if you want bookamarks toolbar to be below tabs */
+/* Uncomment the following if you want bookmarks toolbar to be below tabs */
 /*
 #PersonalToolbar{ -moz-box-ordinal-group: 2 }
 */
\ No newline at end of file
diff --git a/chrome/toolbars_below_content.css b/chrome/toolbars_below_content.css
index 0c270fd..1f43a52 100644
--- a/chrome/toolbars_below_content.css
+++ b/chrome/toolbars_below_content.css
@@ -18,9 +18,13 @@ See the above repository for updates as well as full license text. */
 
   #mainPopupSet,
   #browser,
-  #customization-container
-  ,#nav-bar, #PersonalToolbar/* Remove this row if you want tabs to be the top-most row */
-  { -moz-box-ordinal-group: 0 }
+  #customization-container,
+  #tab-notification-deck{
+    -moz-box-ordinal-group: 0
+  }
+
+  /* Remove the next row if you want tabs to be the top-most row */
+  #titlebar{ -moz-box-ordinal-group: 2 } 
 
   #toolbar-menubar{ position: fixed; display: flex; width: 100vw; top: 0px; }
   /* Remove bottom border that won't do anything useful when at bottom of the window */