From ea17cb7f1f01bf9c2abec0008716949f417221ab Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Sun, 27 Mar 2022 15:31:59 +0300
Subject: [PATCH] Show window global notificationbox in same order as tab modal

---
 chrome/autohide_bookmarks_and_main_toolbars.css | 3 ++-
 chrome/autohide_main_toolbar.css                | 6 +++---
 chrome/multi-row_tabs_below_content.css         | 8 +++++++-
 chrome/tabs_on_bottom.css                       | 3 +++
 chrome/tabs_on_bottom_menubar_on_top_patch.css  | 5 +++++
 chrome/toolbars_below_content.css               | 2 ++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/chrome/autohide_bookmarks_and_main_toolbars.css b/chrome/autohide_bookmarks_and_main_toolbars.css
index 1828208..983c0e2 100644
--- a/chrome/autohide_bookmarks_and_main_toolbars.css
+++ b/chrome/autohide_bookmarks_and_main_toolbars.css
@@ -95,7 +95,8 @@ See the above repository for updates as well as full license text. */
   transform: rotateX(0);
 }
 /* This makes the tab notification box show immediately below tabs, otherwise it would break the layout */
-:where(#titlebar,#tab-notification-deck){
+#navigator-toolbox > div{ display: contents }
+:where(#titlebar,#tab-notification-deck,.global-notificationbox){
   -moz-box-ordinal-group: 0;
 }
 /* Show when cursor is over popups/context-menus - cannot control which ones */
diff --git a/chrome/autohide_main_toolbar.css b/chrome/autohide_main_toolbar.css
index a124578..59a4095 100644
--- a/chrome/autohide_main_toolbar.css
+++ b/chrome/autohide_main_toolbar.css
@@ -6,11 +6,11 @@ See the above repository for updates as well as full license text. */
 :root{ --uc-navbar-transform: -40px }
 :root[uidensity="compact"]{ --uc-navbar-transform: -34px }
 
-:root[sessionrestored] :where(#nav-bar,#PersonalToolbar,#tab-notification-deck){
+#navigator-toolbox > div{ display: contents; }
+:root[sessionrestored] :where(#nav-bar,#PersonalToolbar,#tab-notification-deck,.global-notificationbox){
   transform: translateY(var(--uc-navbar-transform))
 }
-
-:root:is([customizing],[chromehidden*="toolbar"]) :where(#nav-bar,#PersonalToolbar,#tab-notification-deck){
+:root:is([customizing],[chromehidden*="toolbar"]) :where(#nav-bar,#PersonalToolbar,#tab-notification-deck,.global-notificationbox){
   transform: none !important;
   opacity: 1 !important;
 }
diff --git a/chrome/multi-row_tabs_below_content.css b/chrome/multi-row_tabs_below_content.css
index 80a98ef..cbdc99a 100644
--- a/chrome/multi-row_tabs_below_content.css
+++ b/chrome/multi-row_tabs_below_content.css
@@ -36,8 +36,14 @@ See the above repository for updates as well as full license text. */
   :root{ border-top-width: 0px !important }
 
   #main-window > body > box,
-  #navigator-toolbox{ -moz-box-ordinal-group: 2; border-bottom: 0px !important }
+  #navigator-toolbox{
+    -moz-box-ordinal-group: 2;
+    border-bottom: 0px !important;
+  }
   
+  /* Re-order window and tab notification boxes */
+  #navigator-toolbox > div{ display: contents }
+  .global-notificationbox,
   #tab-notification-deck{ -moz-box-ordinal-group: 0 }
 
   #titlebar{-moz-appearance: none !important; } /* Try setting to "-moz-window-titlebar" if you face issues */
diff --git a/chrome/tabs_on_bottom.css b/chrome/tabs_on_bottom.css
index 872a7bb..33ad552 100644
--- a/chrome/tabs_on_bottom.css
+++ b/chrome/tabs_on_bottom.css
@@ -50,6 +50,9 @@ linux_gtk_window_control_patch.css
   -moz-appearance: none !important;
   --tabs-navbar-shadow-size: 0px;
 }
+/* Re-order window and tab notification boxes */
+#navigator-toolbox > div{ display: contents }
+.global-notificationbox,
 #tab-notification-deck{ -moz-box-ordinal-group: 2 }
 
 #TabsToolbar .titlebar-spacer{ display: none; }
diff --git a/chrome/tabs_on_bottom_menubar_on_top_patch.css b/chrome/tabs_on_bottom_menubar_on_top_patch.css
index 8ecf02b..922c50e 100644
--- a/chrome/tabs_on_bottom_menubar_on_top_patch.css
+++ b/chrome/tabs_on_bottom_menubar_on_top_patch.css
@@ -22,6 +22,11 @@ See the above repository for updates as well as full license text. */
   -moz-window-dragging: drag;
   padding-top: calc(var(--uc-menubar-height) + var(--uc-titlebar-padding, 0px)) !important;
 }
+/* Remove window dragging from notification boxes */
+#tab-notification-deck,
+.global-notificationbox{
+  -moz-window-dragging: no-drag;
+}
 :root[sizemode="fullscreen"] #navigator-toolbox{ padding-top: 0px !important; }
 #toolbar-menubar{
   position: fixed;
diff --git a/chrome/toolbars_below_content.css b/chrome/toolbars_below_content.css
index 37d0492..adce037 100644
--- a/chrome/toolbars_below_content.css
+++ b/chrome/toolbars_below_content.css
@@ -24,6 +24,8 @@ See the above repository for updates as well as full license text. */
     :root[sizemode="maximized"][tabsintitlebar] :where(#browser,#customization-container,#toolbar-menubar){ margin-top: 8px }
   }
 
+  #navigator-toolbox > div{ display: contents }
+  .global-notificationbox,
   #mainPopupSet,
   #browser,
   #customization-container,