diff --git a/chrome/classic_firefox_menu_button.css b/chrome/classic_firefox_menu_button.css index ae66dcb..f14e0ec 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[tabsintitlebar] #nav-bar{ +:root:is([tabsintitlebar],[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 f58151d..7adb053 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[tabsintitlebar]:not([customizing]) .urlbar-input-container::before{ +:root:is([tabsintitlebar],[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[tabsintitlebar] .browser-titlebar, +:root:is([tabsintitlebar],[customtitlebar]) .browser-titlebar, #titlebar{ opacity: 1 !important; will-change: unset !important; diff --git a/chrome/hide_tabs_toolbar_v2.css b/chrome/hide_tabs_toolbar_v2.css index b2c5c18..0a40b81 100644 --- a/chrome/hide_tabs_toolbar_v2.css +++ b/chrome/hide_tabs_toolbar_v2.css @@ -23,7 +23,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[tabsintitlebar] #toolbar-menubar:not([autohide="false"]) ~ #nav-bar{ + :root:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:not([autohide="false"]) ~ #nav-bar{ > .titlebar-buttonbox-container{ display: flex !important; } diff --git a/chrome/menubar_in_main_toolbar.css b/chrome/menubar_in_main_toolbar.css index a5cd887..0a75b0b 100644 --- a/chrome/menubar_in_main_toolbar.css +++ b/chrome/menubar_in_main_toolbar.css @@ -29,5 +29,5 @@ See the above repository for updates as well as full license text. */ #nav-bar{ padding-left: 300px; } #toolbar-menubar > .titlebar-buttonbox-container{ display: none } -:root[tabsintitlebar][sizemode="normal"] .titlebar-spacer, -:root[tabsintitlebar] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } +:root:is([tabsintitlebar],[customtitlebar])[sizemode="normal"] .titlebar-spacer, +:root:is([tabsintitlebar],[customtitlebar]) #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } diff --git a/chrome/oneline_toolbar.css b/chrome/oneline_toolbar.css index c85b7ca..349ff45 100644 --- a/chrome/oneline_toolbar.css +++ b/chrome/oneline_toolbar.css @@ -58,7 +58,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[tabsintitlebar] :where(#toolbar-menubar:not([autohide="false"])){ + :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:not([autohide="false"])){ + #TabsToolbar{ :root[sizemode="normal"] & { > .titlebar-spacer[type="post-tabs"]{ @@ -78,7 +78,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } - :root[tabsintitlebar] :where(#toolbar-menubar:not([autohide="false"])){ + :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:not([autohide="false"])){ + #TabsToolbar > :is(.titlebar-buttonbox-container,.titlebar-spacer[type="post-tabs"]){ display: flex !important; } @@ -99,7 +99,7 @@ See the above repository for updates as well as full license text. */ :root[sizemode="fullscreen"] #TabsToolbar > .titlebar-buttonbox-container{ display: flex !important; } - :root[tabsintitlebar] :where(#toolbar-menubar:not([autohide="false"])){ + :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar:not([autohide="false"])){ + #TabsToolbar > :is(.titlebar-buttonbox-container,.titlebar-spacer[type="pre-tabs"]){ display: flex !important; } @@ -117,7 +117,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[tabsintitlebar] :where(#toolbar-menubar:not([autohide="false"])){ + :root:is([tabsintitlebar],[customtitlebar]) :where(#toolbar-menubar: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 8b6c317..18ce513 100644 --- a/chrome/selected_tab_as_urlbar.css +++ b/chrome/selected_tab_as_urlbar.css @@ -113,6 +113,6 @@ See the above repository for updates as well as full license text. */ background-color: transparent !important; } -:root[tabsintitlebar] #titlebar:has(> [autohide="false"]) + #nav-bar{ +:root:is([tabsintitlebar],[customtitlebar]) #titlebar:has(> [autohide="false"]) + #nav-bar{ border-inline-width: 0 !important; } diff --git a/chrome/tabs_below_content_v2.css b/chrome/tabs_below_content_v2.css index d5f1ca0..70fda08 100644 --- a/chrome/tabs_below_content_v2.css +++ b/chrome/tabs_below_content_v2.css @@ -39,7 +39,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[tabsintitlebar] #toolbar-menubar:not([autohide="false"]) ~ #nav-bar{ + :root:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar: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 77fec5c..dd57762 100644 --- a/chrome/tabs_on_bottom_v2.css +++ b/chrome/tabs_on_bottom_v2.css @@ -23,7 +23,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[tabsintitlebar] #toolbar-menubar:not([autohide="false"]) ~ #nav-bar{ + :root:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar:not([autohide="false"]) ~ #nav-bar{ > .titlebar-buttonbox-container{ display: flex !important; }