4.6.7

Aris-t2 · Dec 3, 2024 · e6fa425 · e6fa425
1 parent cbf2735
commit e6fa425
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 170 deletions.
diff --git a/current/css/generalui/private_mode_indicator_hidden.css b/current/css/generalui/private_mode_indicator_hidden.css
@@ -11,6 +11,6 @@
   visibility: collapse !important;
 }
 
-#TabsToolbar :is(#private-browsing-indicator-with-label,.private-browsing-indicator-with-label) {
+#TabsToolbar :is(#private-browsing-indicator-with-label,.private-browsing-indicator-with-label, .private-browsing-indicator-icon,.private-browsing-indicator-label) {
   display: none !important;
 }
diff --git a/current/css/locationbar/urlbar_background_old_colors.css b/current/css/locationbar/urlbar_background_old_colors.css
@@ -5,7 +5,7 @@
 
 /* restore correct location bar colors, known from pre-Fx133 versions */
 
-:root {
+:root:not([lwtheme]) {
   --toolbar-field-background-color: Field !important;
   --toolbar-field-color: FieldText !important;
   --toolbar-field-border-color: var(--input-border-color) !important;

diff --git a/current/css/locationbar/urlbar_background_old_colors_lwtheme.css b/current/css/locationbar/urlbar_background_old_colors_lwtheme.css
@@ -0,0 +1,15 @@
+/* Firefox userChrome.css tweaks ********************************************************/
+/* Github: https://github.com/aris-t2/customcssforfx ************************************/
+/****************************************************************************************/
+
+
+/* restore correct location bar colors, known from pre-Fx133 versions */
+
+:root[lwtheme] {
+  --toolbar-field-background-color: Field !important;
+  --toolbar-field-color: FieldText !important;
+  --toolbar-field-border-color: var(--input-border-color) !important;
+  --toolbar-field-focus-background-color: Field !important;
+  --toolbar-field-focus-color: FieldText !important;
+  --toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent) !important;
+}
diff --git a/current/css/tabs/tabs_below_main_content.css b/current/css/tabs/tabs_below_main_content.css
@@ -3,7 +3,7 @@
 /****************************************************************************************/
 
 
-@import "./tabs_below_navigation_toolbar_fx128-132.css";
+@import "./tabs_below_navigation_toolbar.css";
 
 /* [!] NOT A STANDALONE FILE! */
 /* [!] This code does not achieve the requested result without above files content! */
@@ -15,34 +15,48 @@
   --tab_below_main_content_top_margin: -3px;
 }
 
-#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox {
-  padding-bottom: 1px !important;
-}
 
 #main-window:not([inDOMFullscreen="true"]) #TabsToolbar {
-  position: fixed !important;
-  display: block !important;
+  position: fixed;
+  display: block;
+  bottom: 0;
+  width: 100vw;
+  background-clip: padding-box;
+  color: var(--toolbar-color);
+  min-height: 0 !important;
+  height: var(--tab_below_main_content_toolbar_height) !important;
+  max-height: unset !important;
+  border-top: 1px solid ThreeDShadow !important;
 }
 
-#main-window:not([chromehidden*="toolbar"]) #navigator-toolbox {
-  padding-bottom: 0px !important;
-  border-bottom: 1px solid threedshadow !important;
+#tabbrowser-tabs {
+  width: 100%;
 }
-/*
+
 #main-window:not([inDOMFullscreen="true"]) #browser,
 #main-window:not([inDOMFullscreen="true"]) #customization-container {
   margin-bottom: var(--tab_below_main_content_bottom_margin) !important;
-}*/
+}
 
-#TabsToolbar {
-  min-height: 0 !important;
-  height: var(--tab_below_main_content_toolbar_height) !important;
-  max-height: unset !important;
-  border-top: 1px solid ThreeDShadow !important;
+#navigator-toolbox {
+  z-index: 3 !important;
+}
+
+#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #toolbar-menubar[inactive] ~ #nav-bar {
+  padding-top: 24px !important;
+}
+
+#toolbar-menubar,
+#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #nav-bar {
+  padding-inline-end: 140px !important;
+}
+
+#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #toolbar-menubar[inactive] ~ #nav-bar {
+  padding-top: initial !important;
 }
 
-#main-window:not([inDOMFullscreen="true"]) #TabsToolbar-customization-target {
-  margin-top: var(--tab_below_main_content_top_margin) !important;
+#toolbar-menubar:not([inactive]) {
+  height: 24px !important;
 }
 
 /* lw-theme support */
@@ -56,51 +70,19 @@
 /* caption button position in maximized mode after moving to the top */
 #main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container,
 #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
-  top: 0px !important;
+  top: 0 !important;
 }
 
-
+/* macOS support*/
 @media (-moz-platform: macos) {
 
   #main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
     padding-top: 24px !important;
   }
 
-  #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #titlebar {
-    height: 0 !important;
-    padding-top: 0 !important;
-    z-index:  1 !important;
-  }
-
   #main-window[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #browser,
   #main-window[sizemode="fullscreen"]:not([inDOMFullscreen="true"]) #customization-container {
     margin-bottom: 0 !important;
   }
 
 }
-
-#navigator-toolbox {
-  z-index: 3 !important;
-}
-
-/* Fx 133+ adjustments */
-#toolbar-menubar[inactive] ~ #nav-bar {
-  padding-top: 28px !important;
-}
-
-#toolbar-menubar {
-  padding-inline-end: 140px;
-}
-
-#toolbar-menubar:not([inactive]) {
-  height: 28px !important;
-}
-
-
-#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #nav-bar {
-  padding-inline-end: 140px !important;
-}
-
-#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="fullscreen"] #toolbar-menubar[inactive] ~ #nav-bar {
-  padding-top: initial !important;
-}
diff --git a/current/css/tabs/tabs_below_navigation_toolbar.css b/current/css/tabs/tabs_below_navigation_toolbar.css
@@ -17,15 +17,21 @@
 }
 
 #main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]) #toolbar-menubar[inactive] ~ #nav-bar {
-  padding-top: 28px !important;
+  padding-top: 24px !important;
 }
 
 #main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar {
   padding-inline-end: 140px;
 }
 
 #main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:not([inactive]) {
-  height: 28px !important;
+  height: 24px !important;
+}
+
+#toolbar-menubar[autohide="true"] {
+    :root:is([tabsintitlebar],[customtitlebar]) #navigator-toolbox:not([tabs-hidden]) > & {
+      min-height: unset !important;
+    }
 }
 
 /* move caption buttons to windows top right position */
@@ -47,39 +53,39 @@
 
 @media (-moz-platform: macos) {
 
-#navigator-toolbox {
-  position: relative;
-  padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding_macOS);
-}
+	#navigator-toolbox {
+	  position: relative;
+	  padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding_macOS);
+	}
 
-#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
-  padding-top: var(--tab_below_navigation_toolbar_toolbox_top_padding_macOS);
-}
+	#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) #navigator-toolbox {
+	  padding-top: var(--tab_below_navigation_toolbar_toolbox_top_padding_macOS);
+	}
 
-#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) .titlebar-buttonbox-container {
-  position: fixed;
-  top: 3px !important;
-  right: unset;
-  left: 0;
-  visibility: visible;
-  display: block;
-}
+	#main-window:is([tabsintitlebar],[customtitlebar]):not([sizemode="fullscreen"]):not([inDOMFullscreen="true"]) .titlebar-buttonbox-container {
+	  position: fixed;
+	  top: 3px !important;
+	  right: unset;
+	  left: 0;
+	  visibility: visible;
+	  display: block;
+	}
 
-:root[lwtheme] #titlebar {
-  background-image: var(--lwt-header-image, var(--lwt-additional-images));
-  background-repeat: var(--lwt-background-tiling);
-  background-position: var(--lwt-background-alignment);
-}
+	:root[lwtheme] #titlebar {
+	  background-image: var(--lwt-header-image, var(--lwt-additional-images));
+	  background-repeat: var(--lwt-background-tiling);
+	  background-position: var(--lwt-background-alignment);
+	}
 
-/* caption button position in maximized mode after moving to the top */
-#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar[autohide="true"] ~ #TabsToolbar .titlebar-buttonbox-container,
-#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
-  top: 0;
-}
+	/* caption button position in maximized mode after moving to the top */
+	#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar[autohide="true"] ~ #TabsToolbar .titlebar-buttonbox-container,
+	#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #TabsToolbar .titlebar-buttonbox-container {
+	  top: 0;
+	}
 
-#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar {
-  height: 0px;
-}
+	#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar {
+	  height: 0px;
+	}
 }
 
 /* remove unneeded items */
@@ -88,7 +94,11 @@
 #TabsToolbar #window-controls,
 #TabsToolbar *[type="caption-buttons"],
 #TabsToolbar *[type="pre-tabs"],
-#TabsToolbar *[type="post-tabs"] {
+#TabsToolbar *[type="post-tabs"],
+#private-browsing-indicator-with-label,
+.private-browsing-indicator-with-label,
+.private-browsing-indicator-icon,
+.private-browsing-indicator-label {
   display: none;
 }