From 3e6975e347ae908d225e98bbb801b412fb4cafe1 Mon Sep 17 00:00:00 2001 From: MrOtherGuy Date: Sun, 2 Nov 2025 06:10:20 +0200 Subject: [PATCH] code cleanup: remove uses of [tabsintitlebar] --- chrome/classic_firefox_menu_button.css | 2 +- chrome/click_selected_tab_to_focus_urlbar.css | 4 ++-- chrome/hide_tabs_with_one_tab.css | 2 +- chrome/menubar_in_main_toolbar.css | 6 +++--- chrome/oneline_toolbar.css | 8 ++++---- chrome/selected_tab_as_urlbar.css | 2 +- chrome/tabs_below_content_v2.css | 2 +- chrome/tabs_on_bottom_v2.css | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chrome/classic_firefox_menu_button.css b/chrome/classic_firefox_menu_button.css index 5ce3383..e239693 100644 --- a/chrome/classic_firefox_menu_button.css +++ b/chrome/classic_firefox_menu_button.css @@ -17,7 +17,7 @@ See the above repository for updates as well as full license text. */ order: -1; margin-inline: 2px var(--uc-window-drag-space-pre,24px) !important; } -:root:is([tabsintitlebar],[customtitlebar]) #nav-bar{ +:root[customtitlebar] #nav-bar{ border-left-width: 0px; padding-left: 0px !important; } diff --git a/chrome/click_selected_tab_to_focus_urlbar.css b/chrome/click_selected_tab_to_focus_urlbar.css index 2f6cc80..36fbcf2 100644 --- a/chrome/click_selected_tab_to_focus_urlbar.css +++ b/chrome/click_selected_tab_to_focus_urlbar.css @@ -49,7 +49,7 @@ See the above repository for updates as well as full license text. */ content: ""; pointer-events: auto; } -:root:is([tabsintitlebar],[customtitlebar]):not([customizing]) .urlbar-input-container::before{ +:root[customtitlebar]:not([customizing]) .urlbar-input-container::before{ left: var(--uc-window-drag-space-width); width: calc(100vw - var(--uc-window-control-width) - var(--uc-buttons-width) - 2 * var(--uc-window-drag-space-width)); } @@ -61,7 +61,7 @@ See the above repository for updates as well as full license text. */ z-index: 1; pointer-events: none } -:root:is([tabsintitlebar],[customtitlebar]) .browser-titlebar, +:root[customtitlebar] .browser-titlebar, #titlebar{ opacity: 1 !important; will-change: unset !important; diff --git a/chrome/hide_tabs_with_one_tab.css b/chrome/hide_tabs_with_one_tab.css index bbabe4e..b8f007e 100644 --- a/chrome/hide_tabs_with_one_tab.css +++ b/chrome/hide_tabs_with_one_tab.css @@ -35,7 +35,7 @@ This will NOT work correctly if you have hidden tabs such as with tab groups ext } /* Fix window controls not being clickable */ -:root[tabsintitlebar] #toolbar-menubar:not([autohide="true"],[autohide=""])[inactive]{ +:root[customtitlebar] #toolbar-menubar:not([autohide="true"],[autohide=""])[inactive]{ transition: height 0ms steps(1) 80ms; } :where(#nav-bar){ diff --git a/chrome/menubar_in_main_toolbar.css b/chrome/menubar_in_main_toolbar.css index bdfe4dc..92d70e2 100644 --- a/chrome/menubar_in_main_toolbar.css +++ b/chrome/menubar_in_main_toolbar.css @@ -26,10 +26,10 @@ See the above repository for updates as well as full license text. */ max-width: 0px !important; } #toolbar-menubar > .titlebar-buttonbox-container{ display: none } -:root:is([tabsintitlebar],[customtitlebar]) #TabsToolbar > .titlebar-buttonbox-container{ +:root[customtitlebar] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } -:root:is([tabsintitlebar],[customtitlebar])[sizemode="normal"] #TabsToolbar > .titlebar-spacer{ +:root[customtitlebar][sizemode="normal"] #TabsToolbar > .titlebar-spacer{ display: flex !important; } @media -moz-pref("userchrome.menubar-in-main-toolbar.tabs-on-bottom.enabled"){ @@ -42,7 +42,7 @@ See the above repository for updates as well as full license text. */ #TabsToolbar#TabsToolbar > :is(.titlebar-buttonbox-container,.titlebar-spacer){ display: none !important; } - :root:is([tabsintitlebar],[customtitlebar]) #nav-bar > :is(.titlebar-spacer[type="post-tabs"],.titlebar-buttonbox-container){ + :root[customtitlebar] #nav-bar > :is(.titlebar-spacer[type="post-tabs"],.titlebar-buttonbox-container){ display: flex !important; } } \ No newline at end of file diff --git a/chrome/oneline_toolbar.css b/chrome/oneline_toolbar.css index ba4bbcd..da21a38 100644 --- a/chrome/oneline_toolbar.css +++ b/chrome/oneline_toolbar.css @@ -59,7 +59,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #nav-bar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + :root[customtitlebar] :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + #TabsToolbar{ :root[sizemode="normal"] & { > .titlebar-spacer[type="post-tabs"]{ @@ -79,7 +79,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + :root[customtitlebar] :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + #TabsToolbar > :is(.titlebar-buttonbox-container,.titlebar-spacer[type="post-tabs"]){ display: flex !important; } @@ -100,7 +100,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + :root[customtitlebar] :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + #TabsToolbar > :is(.titlebar-buttonbox-container,.titlebar-spacer[type="pre-tabs"]){ display: flex !important; } @@ -118,7 +118,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #nav-bar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ + :root[customtitlebar] :where(#toolbar-menubar:is([autohide=""],not([autohide="false"]))){ :root[sizemode="normal"] & { + #TabsToolbar > .titlebar-spacer[type="pre-tabs"]{ display: flex !important; diff --git a/chrome/selected_tab_as_urlbar.css b/chrome/selected_tab_as_urlbar.css index 175422c..8b1ed23 100644 --- a/chrome/selected_tab_as_urlbar.css +++ b/chrome/selected_tab_as_urlbar.css @@ -115,6 +115,6 @@ See the above repository for updates as well as full license text. */ background-color: transparent !important; } -:root:is([tabsintitlebar],[customtitlebar]) #titlebar:has(> #toolbar-menubar:is([autohide="false"],not([autohide]))) + #nav-bar{ +:root[customtitlebar] #titlebar:has(> #toolbar-menubar:is([autohide="false"],not([autohide]))) + #nav-bar{ border-inline-width: 0 !important; } diff --git a/chrome/tabs_below_content_v2.css b/chrome/tabs_below_content_v2.css index 0500e93..8aa5e15 100644 --- a/chrome/tabs_below_content_v2.css +++ b/chrome/tabs_below_content_v2.css @@ -41,7 +41,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #nav-bar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:is([autohide=""],not([autohide="false"])) ~ #nav-bar{ + :root[customtitlebar] #toolbar-menubar:is([autohide=""],not([autohide="false"])) ~ #nav-bar{ > .titlebar-buttonbox-container{ display: flex !important; } diff --git a/chrome/tabs_on_bottom_v2.css b/chrome/tabs_on_bottom_v2.css index 26abe70..ca14895 100644 --- a/chrome/tabs_on_bottom_v2.css +++ b/chrome/tabs_on_bottom_v2.css @@ -26,7 +26,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #nav-bar > .titlebar-buttonbox-container{ display: flex !important; } - :root:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:is([autohide=""],not([autohide="false"])) ~ #nav-bar{ + :root[customtitlebar] #toolbar-menubar:is([autohide=""],not([autohide="false"])) ~ #nav-bar{ > .titlebar-buttonbox-container{ display: flex !important; }