From 98ecf73e1bda4f7510ae7b71751e14dd8ddef5e3 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sun, 21 Apr 2024 13:50:19 +0800
Subject: [PATCH] Fixed #1026

---
 .../firefox/Monterey/parts/tabsbar-alt.css    | 28 ++++++++++---------
 .../firefox/Monterey/parts/toolbox-alt.css    | 10 ++++++-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/other/firefox/Monterey/parts/tabsbar-alt.css b/src/other/firefox/Monterey/parts/tabsbar-alt.css
index 8ea016ac..a99c614c 100644
--- a/src/other/firefox/Monterey/parts/tabsbar-alt.css
+++ b/src/other/firefox/Monterey/parts/tabsbar-alt.css
@@ -6,11 +6,6 @@
 	--space-above-tabbar: 0 !important;
 }
 
-/* Fix tabs bar icon sizes */
-#TabsToolbar tab {
-	margin-bottom: 6px !important;
-}
-
 /* Tabs bar height */
 #tabbrowser-tabs,
 #tabbrowser-tabs arrowscrollbox {
@@ -302,7 +297,7 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 #TabsToolbar #alltabs-button {
-	padding: 0 0 !important;
+	padding: 0 !important;
 	visibility: collapse !important;
 }
 
@@ -314,18 +309,21 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 #TabsToolbar .toolbarbutton-1 image,
-#tabs-newtab-button image, #TabsToolbar #new-tab-button image {
+#tabs-newtab-button image,
+#TabsToolbar #new-tab-button image {
 	margin: 0 !important;
 	padding: 0 !important;
 	height: 16px !important;
 	width: 16px !important;
 }
 
-#TabsToolbar #scrollbutton-up, #TabsToolbar #scrollbutton-down {
+#TabsToolbar #scrollbutton-up,
+#TabsToolbar #scrollbutton-down {
 	height: 36px !important;
 }
 
-#TabsToolbar #scrollbutton-up image, #TabsToolbar #scrollbutton-down image {
+#TabsToolbar #scrollbutton-up image,
+#TabsToolbar #scrollbutton-down image {
 	margin: 0 !important;
 	padding: 0 !important;
 	height: 16px !important;
@@ -333,10 +331,14 @@ tab[selected]:-moz-window-inactive .tab-label {
 }
 
 /* firefox-view-button */
-:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs {
-	border-inline-start: none !important;
-	padding-inline-start: 0 !important;
-	margin-inline-start: 0 !important;
+:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
+:root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
+  toolbarbutton:not(#firefox-view-button),
+  toolbarpaletteitem:not(#wrapper-firefox-view-button)
+) + #tabbrowser-tabs {
+  border-inline-start: none !important;
+  padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important;
+  margin-inline-start: 0 !important;
 }
 
 #firefox-view-button {
diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css
index bfaf8aad..76064c64 100644
--- a/src/other/firefox/Monterey/parts/toolbox-alt.css
+++ b/src/other/firefox/Monterey/parts/toolbox-alt.css
@@ -7,7 +7,13 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-#nav-bar, #PersonalToolbar, #toolbar-menubar, #TabsToolbar, #titlebar {
+#nav-bar,
+#titlebar,
+#PersonalToolbar,
+#toolbar-menubar,
+#TabsToolbar,
+#navigator-toolbox,
+.notificationbox-stack {
 	border: none !important;
 	color: var(--gnome-toolbar-color);
 	background: var(--gnome-toolbar-background) !important;
@@ -27,6 +33,7 @@ findbar {
 #PersonalToolbar:-moz-window-inactive,
 #toolbar-menubar:-moz-window-inactive,
 #TabsToolbar:-moz-window-inactive,
+#navigator-toolbox:-moz-window-inactive,
 findbar:-moz-window-inactive {
 	background: var(--gnome-inactive-toolbar-background) !important;
 }
@@ -83,6 +90,7 @@ findbar:-moz-window-inactive {
 #navigator-toolbox #TabsToolbar {
 	-moz-box-ordinal-group: 100;
 	order: 100;
+	padding-bottom: 6px !important;
 }
 
 /* Sidebar */