From e6fa4254aa789ef9340719da7b930978096e0105 Mon Sep 17 00:00:00 2001 From: Aris-t2 Date: Tue, 3 Dec 2024 18:32:17 +0100 Subject: [PATCH] 4.6.7 --- .../private_mode_indicator_hidden.css | 2 +- .../urlbar_background_old_colors.css | 2 +- .../urlbar_background_old_colors_lwtheme.css | 15 +++ current/css/tabs/tabs_below_main_content.css | 86 ++++++-------- .../tabs/tabs_below_navigation_toolbar.css | 72 ++++++----- ...abs_below_navigation_toolbar_fx128-132.css | 112 +++++++++--------- ...igation_toolbar_higher_navbar_position.css | 31 ++--- current/userChrome.css | 15 ++- 8 files changed, 165 insertions(+), 170 deletions(-) create mode 100644 current/css/locationbar/urlbar_background_old_colors_lwtheme.css diff --git a/current/css/generalui/private_mode_indicator_hidden.css b/current/css/generalui/private_mode_indicator_hidden.css index a3edf71..098b997 100644 --- 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 index c5ea592..1b4d113 100644 --- 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 new file mode 100644 index 0000000..a28a4c7 --- /dev/null +++ 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 index 4304a88..3b76357 100644 --- 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 index d509d73..c226579 100644 --- a/current/css/tabs/tabs_below_navigation_toolbar.css +++ b/current/css/tabs/tabs_below_navigation_toolbar.css @@ -17,7 +17,7 @@ } #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 { @@ -25,7 +25,13 @@ } #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; } diff --git a/current/css/tabs/tabs_below_navigation_toolbar_fx128-132.css b/current/css/tabs/tabs_below_navigation_toolbar_fx128-132.css index c0582c8..458d971 100644 --- a/current/css/tabs/tabs_below_navigation_toolbar_fx128-132.css +++ b/current/css/tabs/tabs_below_navigation_toolbar_fx128-132.css @@ -26,66 +26,66 @@ } @media (-moz-platform: windows),(-moz-platform: linux) { -#navigator-toolbox { - position: relative; - padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding); -} + #navigator-toolbox { + position: relative; + padding-bottom: var(--tab_below_navigation_toolbar_bottom_padding); + } -#main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #titlebar, -#main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar { - height: 26px; -} + #main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #titlebar, + #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #titlebar { + height: 26px; + } -/* prevent possible item overlapping with caption buttons */ -#main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar { - padding-inline-end: 140px; -} + /* prevent possible item overlapping with caption buttons */ + #main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar { + padding-inline-end: 140px; + } -/* move caption buttons to windows top right position */ -.titlebar-buttonbox-container { - position: fixed; - right: 0; - visibility: visible; - display: block; -} + /* move caption buttons to windows top right position */ + .titlebar-buttonbox-container { + position: fixed; + right: 0; + visibility: visible; + display: block; + } } @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 */ @@ -174,17 +174,17 @@ @media (-moz-platform: macos) { #main-window:is([tabsintitlebar],[customtitlebar]) #TabsToolbar { - padding-inline-end: 0px !important -} + padding-inline-end: 0px !important + } -/* draggable window */ -#main-window:is([tabsintitlebar],[customtitlebar]) toolbox#navigator-toolbox{ - -moz-window-dragging: drag !important; -} + /* draggable window */ + #main-window:is([tabsintitlebar],[customtitlebar]) toolbox#navigator-toolbox{ + -moz-window-dragging: drag !important; + } -:is(#TabsToolbar, #nav-bar, #PlacesToolbar) { - -moz-window-dragging: no-drag !important; -} + :is(#TabsToolbar, #nav-bar, #PlacesToolbar) { + -moz-window-dragging: no-drag !important; + } } /* Fx 126+ */ diff --git a/current/css/tabs/tabs_below_navigation_toolbar_higher_navbar_position.css b/current/css/tabs/tabs_below_navigation_toolbar_higher_navbar_position.css index 1366aa5..d62360a 100644 --- a/current/css/tabs/tabs_below_navigation_toolbar_higher_navbar_position.css +++ b/current/css/tabs/tabs_below_navigation_toolbar_higher_navbar_position.css @@ -13,16 +13,9 @@ padding-inline-start: var(--appbutton_in_titlebar) !important; } -:root:not([lwtheme]):is([tabsintitlebar],[customtitlebar]) #nav-bar, -#main-window:is([tabsintitlebar],[customtitlebar]) #nav-bar { - appearance: none !important; - background: transparent !important; - border-top: unset !important; -} - :root:not([lwtheme]):is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide][inactive] ~ #nav-bar, #main-window:is([tabsintitlebar],[customtitlebar]) #toolbar-menubar[autohide][inactive] ~ #nav-bar { - margin-inline-end: 145px !important; + padding-inline-end: 145px !important; } #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="normal"] #navigator-toolbox #nav-bar { @@ -44,13 +37,12 @@ #main-window:is([tabsintitlebar],[customtitlebar]) #nav-bar, #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #nav-bar { margin-top: -20px !important; - z-index: 1000 !important; } @media (-moz-platform: windows) { #main-window:is([tabsintitlebar],[customtitlebar]) #nav-bar, #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"] #nav-bar { - margin-top: -24px !important; + margin-top: -26px !important; } } @@ -71,12 +63,10 @@ /* Windows */ @media (-moz-platform: windows) { - #main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container { - top: 1px !important; - } - #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container { - top: 0px !important; - } + #main-window:is([tabsintitlebar],[customtitlebar]):not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container, + #main-window:is([tabsintitlebar],[customtitlebar])[sizemode="maximized"]:not([inDOMFullscreen="true"]) #toolbar-menubar ~ #TabsToolbar .titlebar-buttonbox-container { + top: 0px !important; + } } /* tweaks for fullscreen mode */ @@ -86,14 +76,7 @@ display: none !important; } -@media all and (-moz-windows-classic) { - :root:not([lwtheme]):is([tabsintitlebar],[customtitlebar]) #nav-bar, - #main-window:is([tabsintitlebar],[customtitlebar]) #nav-bar { - margin-inline-end: 0px !important; - } -} - -#main-window :is(#TabsToolbar,#nav-bar,#PersonalToolbar,#toolbar-menubar,.browser-toolbar) { +:root:not([lwtheme]) :is(#TabsToolbar,#nav-bar,#PersonalToolbar,#toolbar-menubar,.browser-toolbar) { appearance: none !important; background: transparent !important; border-top: unset !important; diff --git a/current/userChrome.css b/current/userChrome.css index de686c0..f4db158 100644 --- a/current/userChrome.css +++ b/current/userChrome.css @@ -2,7 +2,7 @@ Firefox userChrome.css tweaks: main file Custom CSS for Firefox 133+ (128 ESR compatible with corresponding settings) - Current version: 4.6.6 + Current version: 4.6.7 Based on 'Classic Theme Restorer' & 'Classic Toolbar Buttons' add-ons CSS code Github: https://github.com/aris-t2/customcssforfx @@ -1205,7 +1205,7 @@ */ - @import "./css/locationbar/megabar_expanding_breakout_disabled.css"; /**/ +@import "./css/locationbar/megabar_expanding_breakout_disabled.css"; /**/ /* @import "./css/locationbar/megabar_expanding_breakout_disabled_fx128-fx132.css"; /**/ @@ -1213,12 +1213,17 @@ Megabar/location bar background color ------------------------------------- + [!] _old_colors.css restores colors known from Firefox 132 and older + [!] _old_colors_lwtheme.css restores colors known from Firefox 132 and older for lwthemes + [!] _color.cs forces a white background color + [!] _color_dark.cs forces a dark background color [!] only use one option at a time */ -@import "./css/locationbar/urlbar_background_old_colors.css"; /**/ /* colors from Firefox 132 and older */ -/* @import "./css/locationbar/urlbar_background_color.css"; /**/ /* default white background color */ -/* @import "./css/locationbar/urlbar_background_color_dark.css"; /**/ /* force dark color for e.g. dark lw-themes */ +@import "./css/locationbar/urlbar_background_old_colors.css"; /**/ +/* @import "./css/locationbar/urlbar_background_old_colors_lwtheme.css"; /**/ +/* @import "./css/locationbar/urlbar_background_color.css"; /**/ +/* @import "./css/locationbar/urlbar_background_color_dark.css"; /**/ /* ---------------------------------------