4.4.4

Aris-t2 · Oct 27, 2023 · 3f85c2c · 3f85c2c
1 parent 5ec2ba4
commit 3f85c2c
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 84 deletions.
diff --git a/current/css/locationbar/urlbar_restore_visible_border.css b/current/css/locationbar/urlbar_restore_visible_border.css
@@ -11,20 +11,10 @@
   }
 }
 
+#urlbar[breakout][breakout-extend] #urlbar-background,
 #urlbar:not([focused="true"]) #urlbar-background,
 #urlbar[open="true"] #urlbar-background,
 #urlbar[focused="true"][open="true"] #urlbar-background,
 #searchbar:not(:focus-within) {
-  border: 1px solid var(--urlbar_border_color) !important;
-}
-
-#urlbar[focused="true"][suppress-focus-border] > #urlbar-input-container {
-  border-top: 1px solid var(--urlbar_border_color) !important;
-  border-left: 1px solid var(--urlbar_border_color) !important;
-  border-right: 1px solid var(--urlbar_border_color) !important;
-}
-
-#urlbar[focused="true"][suppress-focus-border][open="true"] > #urlbar-input-container {
-  border-bottom-left-radius: 0px !important;
-  border-bottom-right-radius: 0px !important;
+  box-shadow: inset 0 0 0 1px var(--urlbar_border_color) !important;
 }
diff --git a/current/css/tabs/classic_squared_tabs.css b/current/css/tabs/classic_squared_tabs.css
@@ -576,14 +576,13 @@
 	#main-window[sizemode="maximized"][tabsintitlebar] #toolbar-menubar {
 	  padding-top: 5px !important;
 	}
-
 	#main-window[sizemode="maximized"] #toolbar-menubar[inactive] + #TabsToolbar > .titlebar-buttonbox-container toolbarbutton {
 	  padding-top: 10px !important;
 	  padding-bottom: 6px !important;
 	}
 }
 
-/* Fx 105+ - remove Firefox-view-button from tabs toolbar */
+/* Fx 105+ - remove Firefox-view-button from tabs toolbar *//*
 :root:not([privatebrowsingmode=temporary]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode=temporary] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
   border-inline-start: 0px solid color-mix(in srgb, currentColor 25%, transparent) !important;
@@ -594,20 +593,20 @@
   margin-inline-start: 0 !important;
 }
 
-#main-window:not([customizing]) #TabsToolbar #firefox-view-button {
+#main-window:not([customizing]) #TabsToolbar :is(#firefox-view-button, #wrapper-firefox-view-button) {
   display: none !important;
 }
 
 #main-window[customizing] #TabsToolbar #firefox-view-button {
   list-style-image: url("chrome://branding/content/about-logo.png") !important;
 }
 
-#main-window[customizing] #TabsToolbar #firefox-view-button image {
+#main-window[customizing]*/ #TabsToolbar #firefox-view-button image {
   width: 16px !important;
   height: 16px !important;
 }
 
-/* Fx 106+*/					
+/* Fx 106+ */
 #private-browsing-indicator-with-label {
   display: none !important;
 }

diff --git a/current/css/tabs/classic_squared_tabs_australized.css b/current/css/tabs/classic_squared_tabs_australized.css
@@ -568,7 +568,7 @@
 	}
 }
 
-/* Fx 105+ - remove Firefox-view-button from tabs toolbar */
+/* Fx 105+ - remove Firefox-view-button from tabs toolbar *//*
 :root:not([privatebrowsingmode=temporary]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode=temporary] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
   border-inline-start: 0px solid color-mix(in srgb, currentColor 25%, transparent) !important;
@@ -579,20 +579,20 @@
   margin-inline-start: 0 !important;
 }
 
-#main-window:not([customizing]) #TabsToolbar #firefox-view-button {
+#main-window:not([customizing]) #TabsToolbar :is(#firefox-view-button, #wrapper-firefox-view-button) {
   display: none !important;
 }
 
 #main-window[customizing] #TabsToolbar #firefox-view-button {
   list-style-image: url("chrome://branding/content/about-logo.png") !important;
 }
 
-#main-window[customizing] #TabsToolbar #firefox-view-button image {
+#main-window[customizing]*/ #TabsToolbar #firefox-view-button image {
   width: 16px !important;
   height: 16px !important;
 }
 
-/* Fx 106+*/					
+/* Fx 106+ */
 #private-browsing-indicator-with-label {
   display: none !important;
 }

diff --git a/current/css/tabs/default_tabs_photon.css b/current/css/tabs/default_tabs_photon.css
@@ -28,7 +28,11 @@
   margin-block: 0px !important;
 }
 
-.tab-background:is([selected],[multiselected]) {
+.tab-background:is([selected],[multiselected]):not(:-moz-lwtheme) {
+  background-image: var(--classic_squared_tabs_active_tab) !important;
+}
+
+.tab-background:is([selected],[multiselected]):-moz-lwtheme {
   background-color: var(--toolbar-bgcolor) !important;
   background-image: var(--toolbar-bgimage) !important;
 }
@@ -86,7 +90,7 @@
 
 /* border between navigation toolbar and tabs toolbar */
 #nav-bar:not(:-moz-lwtheme) {
-  box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--chrome-content-separator-color) !important;
+  box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 color-mix(in srgb, currentColor 20%, transparent) !important;
 }
 
 #nav-bar:-moz-lwtheme {
@@ -196,7 +200,7 @@
 	}
 }
 
-/* Fx 105+ - remove Firefox-view-button from tabs toolbar */
+/* Fx 105+ - remove Firefox-view-button from tabs toolbar *//*
 :root:not([privatebrowsingmode=temporary]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode=temporary] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
   border-inline-start: 0px solid color-mix(in srgb, currentColor 25%, transparent) !important;
@@ -207,18 +211,18 @@
   margin-inline-start: 0 !important;
 }
 
-#main-window:not([customizing]) #TabsToolbar #firefox-view-button {
+#main-window:not([customizing]) #TabsToolbar :is(#firefox-view-button, #wrapper-firefox-view-button) {
   display: none !important;
 }
 
 #main-window[customizing] #TabsToolbar #firefox-view-button {
   list-style-image: url("chrome://branding/content/about-logo.png") !important;
 }
 
-#main-window[customizing] #TabsToolbar #firefox-view-button image {
+#main-window[customizing]*//* #TabsToolbar #firefox-view-button image {
   width: 16px !important;
   height: 16px !important;
-}
+}*/
 
 /* Fx 106+ */
 #private-browsing-indicator-with-label {
@@ -255,5 +259,3 @@
 #TabsToolbar .titlebar-spacer[type="post-tabs"] {
   display: none !important;
 }
-
-/**/
diff --git a/current/css/tabs/default_tabs_photon_alt.css b/current/css/tabs/default_tabs_photon_alt.css
@@ -24,12 +24,17 @@
   margin-block: 0px !important;
 }
 
-.tab-background[multiselected],
-.tab-background[selected] {
+.tab-background:is([selected],[multiselected]):not(:-moz-lwtheme) {
+  background-image: var(--classic_squared_tabs_active_tab) !important;
+}
+
+.tab-background:is([selected],[multiselected]):-moz-lwtheme {
   background-color: var(--toolbar-bgcolor) !important;
   background-image: var(--toolbar-bgimage) !important;
 }
 
+
+
 /* remove left and right tab spaces */
 #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[first-visible-unpinned-tab] {
   margin-inline-start: 0px !important;
@@ -78,7 +83,7 @@
 
 /* border between navigation toolbar and tabs toolbar */
 #nav-bar:not(:-moz-lwtheme) {
-  box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 var(--chrome-content-separator-color) !important;
+  box-shadow: 0 calc(-1 * var(--tabs-navbar-shadow-size)) 0 color-mix(in srgb, currentColor 20%, transparent) !important;
 }
 
 #nav-bar:-moz-lwtheme {
@@ -155,7 +160,7 @@
 	}
 }
 
-/* Fx 105+ - remove Firefox-view-button from tabs toolbar */
+/* Fx 105+ - remove Firefox-view-button from tabs toolbar *//*
 :root:not([privatebrowsingmode=temporary]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
 :root[privatebrowsingmode=temporary] :is(toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button)) + #tabbrowser-tabs {
   border-inline-start: 0px solid color-mix(in srgb, currentColor 25%, transparent) !important;
@@ -166,11 +171,20 @@
   margin-inline-start: 0 !important;
 }
 
-#firefox-view-button {
+#main-window:not([customizing]) #TabsToolbar :is(#firefox-view-button, #wrapper-firefox-view-button) {
   display: none !important;
 }
 
-/* Fx 106+*/	
+#main-window[customizing] #TabsToolbar #firefox-view-button {
+  list-style-image: url("chrome://branding/content/about-logo.png") !important;
+}
+
+#main-window[customizing] #TabsToolbar #firefox-view-button image {
+  width: 16px !important;
+  height: 16px !important;
+}
+
+/* Fx 106+ */
 #private-browsing-indicator-with-label {
   display: none !important;
 }
@@ -179,3 +193,6 @@
   margin-inline-start: 0px !important;
 }
 
+.tabbrowser-tab:is([selected],[multiselected]) {
+  z-index: 100 !important;
+}
diff --git a/current/css/tabs/tabs_below_navigation_toolbar.css b/current/css/tabs/tabs_below_navigation_toolbar.css
@@ -20,15 +20,17 @@
 }
 
 /* overrides other settings too */
-#main-window:not(:-moz-lwtheme) #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme){
-  appearance: none;
-  background-image: var(--tabs_toolbar_color_tabs_not_on_top) !important;
-}
-
+#main-window:not(:-moz-lwtheme) #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme),
 #main-window:not([tabsintitlebar]) #TabsToolbar:not(:-moz-lwtheme){
   appearance: none !important;
 }
 
+@media not (-moz-toolbar-prefers-color-scheme: dark), not (prefers-color-scheme: dark) {
+	#main-window:not(:-moz-lwtheme) #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme){
+	  background-image: var(--tabs_toolbar_color_tabs_not_on_top) !important;
+	}
+}
+
 #tabbrowser-tabs {
   width: 100%;
 }

diff --git a/current/css/toolbars/general_toolbar_colors.css b/current/css/toolbars/general_toolbar_colors.css
@@ -10,16 +10,22 @@
   --general_toolbar_text_shadow: transparent;
 }
 
-#nav-bar:not(:-moz-lwtheme) {
-  appearance: none !important;
-  background: var(--general_toolbar_color_navbar, inherit) !important;
-}
-
+#nav-bar:not(:-moz-lwtheme),
 #main-window toolbar:not(:-moz-lwtheme):not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar) {
   appearance: none !important;
   background: var(--general_toolbar_color_toolbars, inherit) !important;
 }
 
+@media not (-moz-toolbar-prefers-color-scheme: dark), not (prefers-color-scheme: dark) {
+	#nav-bar:not(:-moz-lwtheme) {
+	  background: var(--general_toolbar_color_navbar, inherit) !important;
+	}
+
+	#main-window toolbar:not(:-moz-lwtheme):not(#TabsToolbar):not(#toolbar-menubar):not(#nav-bar) {
+	  background: var(--general_toolbar_color_toolbars, inherit) !important;
+	}
+}
+
 #nav-bar:not(:-moz-lwtheme) #urlbar ::-moz-selection {
   background-color: Highlight !important;
   color: HighlightText !important;