From 13109b6d3de5aecc2da9eb9502a040e06e307b13 Mon Sep 17 00:00:00 2001 From: MrOtherGuy Date: Sat, 5 Oct 2024 08:44:59 +0300 Subject: [PATCH] Trivial selector changes from titlebar removal --- chrome/autohide_main_toolbar.css | 1 + chrome/button_effect_icon_glow.css | 6 +- chrome/click_selected_tab_to_focus_urlbar.css | 2 + chrome/minimal_toolbarbuttons_v2.css | 1 + chrome/minimal_toolbarbuttons_v3.css | 1 + chrome/non_floating_sharp_tabs.css | 1 + chrome/selected_tab_as_urlbar.css | 6 +- chrome/show_navbar_on_focus_only.css | 2 +- chrome/status_inside_menubar.css | 2 +- chrome/tabs_on_bottom_v2.css | 91 ++++++------------- chrome/vertical_menubar.css | 3 +- 11 files changed, 43 insertions(+), 73 deletions(-) diff --git a/chrome/autohide_main_toolbar.css b/chrome/autohide_main_toolbar.css index 89c0e57..1e2c0cb 100644 --- a/chrome/autohide_main_toolbar.css +++ b/chrome/autohide_main_toolbar.css @@ -39,6 +39,7 @@ See the above repository for updates as well as full license text. */ } /* Show when toolbox is hovered */ #titlebar:hover ~ .browser-toolbar, +.browser-titlebar:hover ~ :is(#nav-bar,#PersonalToolbar), #nav-bar:hover, #nav-bar:hover + #PersonalToolbar{ transform: translateY(0); diff --git a/chrome/button_effect_icon_glow.css b/chrome/button_effect_icon_glow.css index 3c85d90..9754f08 100644 --- a/chrome/button_effect_icon_glow.css +++ b/chrome/button_effect_icon_glow.css @@ -37,7 +37,7 @@ toolbarbutton#scrollbutton-down{ #page-action-buttons > .urlbar-icon:hover, .urlbar-icon-wrapper:hover > .urlbar-icon, toolbar .toolbarbutton-1:not([disabled]):hover .toolbarbutton-icon, -#TabsToolbar toolbarbutton:not([disabled]):hover .toolbarbutton-icon, +.browser-toolbar toolbarbutton:not([disabled]):hover .toolbarbutton-icon, toolbar #downloads-button:hover #downloads-indicator-anchor, .identity-box-button:hover, #tracking-protection-icon:hover, @@ -50,7 +50,7 @@ toolbarbutton#scrollbutton-down:not([disabled]):hover{ } /* Active states and close window button hover state */ -#titlebar .titlebar-buttonbox > .titlebar-close:hover > .toolbarbutton-icon, +.browser-toolbar .titlebar-buttonbox > .titlebar-close:hover > .toolbarbutton-icon, .close-icon:active, .urlbar-history-dropmarker:active, #page-action-buttons > .urlbar-icon:active, @@ -59,7 +59,7 @@ toolbarbutton#scrollbutton-down:not([disabled]):hover{ .urlbar-icon-wrapper[open] > .urlbar-icon, toolbar toolbarbutton:not([disabled]):active .toolbarbutton-icon, toolbar toolbarbutton:not([disabled])[open] .toolbarbutton-icon, -#TabsToolbar toolbarbutton:not([disabled]):active .toolbarbutton-icon, +.browser-toolbar toolbarbutton:not([disabled]):active .toolbarbutton-icon, toolbar #downloads-button:active #downloads-indicator-anchor, toolbar #downloads-button[open] #downloads-indicator-anchor, .identity-box-button:active, diff --git a/chrome/click_selected_tab_to_focus_urlbar.css b/chrome/click_selected_tab_to_focus_urlbar.css index ae63689..f58151d 100644 --- a/chrome/click_selected_tab_to_focus_urlbar.css +++ b/chrome/click_selected_tab_to_focus_urlbar.css @@ -23,6 +23,7 @@ See the above repository for updates as well as full license text. */ :root:is([sizemode="maximized"],[sizemode="fullscreen"]){ --uc-window-drag-space-width: 0px; } + #toolbar-menubar[autohide="false"] ~ #nav-bar, #titlebar:has(> [autohide="false"]) + #nav-bar{ --uc-window-drag-space-width: 0px; --uc-menubar-height: 28px; @@ -60,6 +61,7 @@ See the above repository for updates as well as full license text. */ z-index: 1; pointer-events: none } +:root[tabsintitlebar] .browser-titlebar, #titlebar{ opacity: 1 !important; will-change: unset !important; diff --git a/chrome/minimal_toolbarbuttons_v2.css b/chrome/minimal_toolbarbuttons_v2.css index 72ff66a..7e027b5 100644 --- a/chrome/minimal_toolbarbuttons_v2.css +++ b/chrome/minimal_toolbarbuttons_v2.css @@ -30,6 +30,7 @@ toolbar:hover .toolbarbutton-1, #nav-bar > #nav-bar-customization-target:hover ~ toolbarbutton:not([open]) > *, #nav-bar > #nav-bar-customization-target:hover ~ toolbaritem:not([open]) > *, #titlebar:hover ~ toolbar .toolbarbutton-1 > *, +#TabsToolbar:hover ~ toolbar .toolbarbutton-1 > *, toolbar .toolbarbutton-1 > *, #tabbrowser-tabs toolbarbutton > *, .titlebar-button > *{ diff --git a/chrome/minimal_toolbarbuttons_v3.css b/chrome/minimal_toolbarbuttons_v3.css index b6bfdfb..2bf01c9 100644 --- a/chrome/minimal_toolbarbuttons_v3.css +++ b/chrome/minimal_toolbarbuttons_v3.css @@ -40,6 +40,7 @@ toolbar:hover .toolbarbutton-1:not(#PanelUI-menu-button) > *, #nav-bar-overflow-button:hover + #PanelUI-button > .toolbarbutton-1 > stack, #PanelUI-menu-button:hover > stack, #titlebar:hover ~ toolbar .toolbarbutton-1 > *, +#TabsToolbar:hover ~ toolbar .toolbarbutton-1 > *, .toolbarbutton-1[open] > *, .titlebar-buttonbox:hover > .titlebar-button > *, #tabbrowser-tabs:hover toolbarbutton > *{ diff --git a/chrome/non_floating_sharp_tabs.css b/chrome/non_floating_sharp_tabs.css index d023aa7..3f1e299 100644 --- a/chrome/non_floating_sharp_tabs.css +++ b/chrome/non_floating_sharp_tabs.css @@ -31,6 +31,7 @@ See the above repository for updates as well as full license text. */ --toolbarbutton-inner-padding: 7px !important; } /* Few exceptions for default light theme */ +:root[lwtheme] #navigator-toolbox:not([movingtab]) > #TabsToolbar, :root[lwtheme] #navigator-toolbox:not([movingtab]) > #titlebar > #TabsToolbar{ --toolbar-bgcolor: transparent; } diff --git a/chrome/selected_tab_as_urlbar.css b/chrome/selected_tab_as_urlbar.css index a7a813e..8b6c317 100644 --- a/chrome/selected_tab_as_urlbar.css +++ b/chrome/selected_tab_as_urlbar.css @@ -76,8 +76,10 @@ See the above repository for updates as well as full license text. */ background-color: var(--toolbar-field-focus-background-color) !important; background-size: auto !important; } - -:root:not([customizing]) #titlebar{ margin-bottom: calc(0px - var(--tab-min-height) - 2*var(--tab-block-margin)); } +:root:not([customizing]) #navigator-toolbox > #TabsToolbar, +:root:not([customizing]) #titlebar{ + margin-bottom: calc(0px - var(--tab-min-height) - 2*var(--tab-block-margin)); +} /* Oh and! also hide other buttons from the nav-bar because why not */ :root:not([customizing]) #nav-bar-customization-target > :not(#urlbar-container){ visibility: collapse } diff --git a/chrome/show_navbar_on_focus_only.css b/chrome/show_navbar_on_focus_only.css index 53c64b6..67c10ba 100644 --- a/chrome/show_navbar_on_focus_only.css +++ b/chrome/show_navbar_on_focus_only.css @@ -6,7 +6,7 @@ See the above repository for updates as well as full license text. */ /* This style totally breaks bookmarks toolbar but can be used with autohide_bookmarks_toolbar.css */ :root:not([customizing]) #navigator-toolbox{ display: grid; grid-template-rows: auto } -:root:not([customizing]) #navigator-toolbox > *{ grid-area: 1/1; } +:root:not([customizing]) #navigator-toolbox > :is(#titlebar,.browser-toolbar){ grid-area: 1/1; } :root:not([customizing]) #titlebar{ -moz-appearance: none !important; } #urlbar-container{ margin-top: 1px } diff --git a/chrome/status_inside_menubar.css b/chrome/status_inside_menubar.css index e89debd..b79abaa 100644 --- a/chrome/status_inside_menubar.css +++ b/chrome/status_inside_menubar.css @@ -21,7 +21,7 @@ As a workaround, the -moz-element background image is removed somewhat often whi grid-area: 1 / 1; } -#titlebar:hover #menubar-items + spacer::after{ +#toolbar-menubar:hover #menubar-items + spacer::after{ background-image: none !important } diff --git a/chrome/tabs_on_bottom_v2.css b/chrome/tabs_on_bottom_v2.css index 84208e5..5318ac6 100644 --- a/chrome/tabs_on_bottom_v2.css +++ b/chrome/tabs_on_bottom_v2.css @@ -1,70 +1,33 @@ /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom_v2.css made available under Mozilla Public License v. 2.0 See the above repository for updates as well as full license text. */ -/* This reorders toolbar to place tabs below other toolbars. Requires Firefox 132+ */ +/* This reorders toolbar to place tabs below other toolbars. Requires Firefox 133+ */ -#navigator-toolbox{ - display: grid; - grid-template-areas: "mb mb mb mb" - "pre toolbar1 post caption" - "toolbar toolbar toolbar toolbar"; - grid-auto-columns: min-content 1fr min-content min-content; - grid-template-rows: auto; -} -@media (-moz-bool-pref: "userchrome.force-window-controls-on-left.enabled"), - (-moz-gtk-csd-reversed-placement), - (-moz-platform: macos){ - #navigator-toolbox{ - grid-template-areas: "mb mb mb mb" - "caption pre toolbar1 post" - "toolbar toolbar toolbar toolbar"; - grid-auto-columns: min-content min-content 1fr min-content; +@media not (-moz-bool-pref: "sidebar.verticalTabs"){ + .global-notificationbox, + #tab-notification-deck, + #TabsToolbar{ + order: 1; } - @media (-moz-platform: windows){ - #TabsToolbar .titlebar-buttonbox{ flex-direction: row-reverse; } + #TabsToolbar > :is(.titlebar-spacer,.titlebar-buttonbox-container){ + display: none; } -} -#titlebar, -#TabsToolbar{ - display: contents; -} -#TabsToolbar > .titlebar-buttonbox-container{ - grid-area: caption; -} -#TabsToolbar > .titlebar-spacer[type="pre-tabs"]{ - grid-area: pre; -} -#TabsToolbar > .titlebar-spacer[type="post-tabs"]{ - grid-area: post; -} -#private-browsing-indicator-with-label{ - grid-area: post; - & > label{ display: none } -} -.titlebar-spacer{ - -moz-window-dragging: drag; -} -#nav-bar{ - grid-area: toolbar1; - border-top: none !important; -} -#toolbar-menubar{ - grid-area: mb; - border-bottom: 0.01px var(--tabs-navbar-separator-style) var(--tabs-navbar-separator-color); -} -#toolbar-menubar, -#TabsToolbar > .toolbar-items, -#PersonalToolbar, -.global-notificationbox, -#tab-notification-deck{ - grid-column: 1/5; -} -.global-notificationbox, -#tab-notification-deck, -#TabsToolbar > .toolbar-items{ - order: 1; -} -.titlebar-spacer, -#TabsToolbar > .titlebar-buttonbox-container{ - background-color: var(--toolbar-bgcolor) -} + :root[tabsintitlebar][sizemode="fullscreen"] #nav-bar > .titlebar-buttonbox-container{ + display: flex !important; + } + :root[tabsintitlebar] #toolbar-menubar[autohide="true"] ~ #nav-bar{ + & > .titlebar-buttonbox-container{ + display: flex !important; + } + :root[sizemode="normal"] & { + & > .titlebar-spacer{ + display: flex !important; + } + } + :root[sizemode="maximized"] & { + & > .titlebar-spacer[type="post-tabs"]{ + display: flex !important; + } + } + } +} \ No newline at end of file diff --git a/chrome/vertical_menubar.css b/chrome/vertical_menubar.css index 83274f8..88b8e7e 100644 --- a/chrome/vertical_menubar.css +++ b/chrome/vertical_menubar.css @@ -16,6 +16,7 @@ See the above repository for updates as well as full license text. */ --uc-vertical-menubar-top: 72px; } } + #navigator-toolbox:has(> #PersonalToolbar[collapsed="false"]) > #toolbar-menubar, #navigator-toolbox:has(> #PersonalToolbar[collapsed="false"]) > #titlebar > #toolbar-menubar{ --uc-vertical-menubar-top: 112px; :root[uidensity="compact"] & { @@ -42,8 +43,6 @@ See the above repository for updates as well as full license text. */ #main-menubar{ flex-direction: column; align-self: flex-start; - } - #main-menubar{ outline: 1px solid var(--arrowpanel-border-color); background-color: light-dark(rgb(235, 235, 239), rgb(31, 30, 37)) }