From e4fc897d9d6935ade5b702e3f54da5158def673b Mon Sep 17 00:00:00 2001 From: zzxxchen Date: Wed, 24 Jun 2026 23:49:00 +0800 Subject: [PATCH 1/3] fix nautilus gnome 50 issues --- src/sass/gtk/apps/_gnome-40.0.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss index 2ce5c4b1..e993d406 100644 --- a/src/sass/gtk/apps/_gnome-40.0.scss +++ b/src/sass/gtk/apps/_gnome-40.0.scss @@ -252,7 +252,7 @@ $flap_sidebar_size: 240px; } } -#NautilusQueryEditor { +#NautilusQueryEditor, .nautilus-query-editor { // search entry padding: 2px $container_padding; border-spacing: 0; @@ -261,7 +261,7 @@ $flap_sidebar_size: 240px; margin: 0; } - #NautilusQueryEditorTag { + #NautilusQueryEditorTag, .nautilus-query-editor-tag { @extend .entry-tag; > button { @@ -278,12 +278,12 @@ $flap_sidebar_size: 240px; } } -#NautilusPathBar { +#NautilusPathBar, .nautilus-pathbar { background-color: $fill_color; border-radius: $bt_radius; margin: 0; - #NautilusPathButton { + #NautilusPathButton, .nautilus-path-button { margin: 0 $container_padding / 2; border-radius: $bt_radius; @@ -301,7 +301,7 @@ $flap_sidebar_size: 240px; } } - > menubutton { + > menubutton, > menubutton.flat.popup { margin: 0; } } From 8096e1bf428e19e964355a1ce9e60d142ddc1f4a Mon Sep 17 00:00:00 2001 From: zzxxchen Date: Wed, 1 Jul 2026 14:15:15 +0800 Subject: [PATCH 2/3] fix: firefox issues --- .../Monterey/parts/headerbar-urlbar.css | 371 ++++++++++++------ other/firefox/Monterey/parts/tabsbar-alt.css | 13 +- .../WhiteSur/parts/headerbar-urlbar.css | 337 ++++++++++------ .../WhiteSur/parts/tabsbar-adaptive.css | 13 +- other/firefox/WhiteSur/parts/tabsbar.css | 13 +- other/firefox/common/parts/dialogs.css | 33 ++ other/firefox/common/parts/icons.css | 3 + other/firefox/common/parts/popups.css | 38 +- .../userChrome-Monterey-alt-adaptive.css | 2 +- .../userChrome-Monterey-alt-darker.css | 2 +- other/firefox/userChrome-Monterey-alt.css | 2 +- 11 files changed, 569 insertions(+), 258 deletions(-) diff --git a/other/firefox/Monterey/parts/headerbar-urlbar.css b/other/firefox/Monterey/parts/headerbar-urlbar.css index d7ed77d1..224b28d4 100644 --- a/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -2,21 +2,27 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +/* Monterey: hide search container, center URL bar at 360px */ #search-container, toolbarspring { display: none !important; } -/* URL bar */ #urlbar { --urlbar-height: 32px !important; --urlbar-container-height: 32px !important; --urlbar-toolbar-height: 32px !important; --urlbar-inner-padding: 0 !important; --urlbar-width: 360px !important; + --urlbar-box-hover-bgcolor: var(--gnome-headerbar-button-hover-background) !important; + --urlbar-box-active-bgcolor: var(--gnome-headerbar-button-active-background) !important; box-shadow: none !important; + border: none !important; width: 360px !important; min-width: 360px !important; + padding: 0 !important; + padding-block: 0 !important; + padding-inline: 0 !important; } #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background, @@ -44,16 +50,42 @@ toolbarspring { min-width: 360px !important; } +#urlbar:-moz-window-inactive { + border-color: var(--gnome-inactive-headerbar-background) !important; +} + border-color: var(--gnome-inactive-headerbar-background) !important; +} + #urlbar-background, .urlbar-background { box-shadow: none !important; border: none !important; - background: none !important; + background: transparent !important; + border-radius: 8px !important; + padding: 0 !important; +} + +[focused]:not([suppress-focus-border]) > .urlbar-background, +#searchbar:focus-within { + outline-color: var(--gnome-focused-urlbar-border-color) !important; + -moz-outline-radius: 8px !important; border-radius: 8px !important; } +[focused]:not([suppress-focus-border]):hover > .urlbar-background, +#searchbar:focus-within:hover { + outline-color: transparent !important; +} + +#urlbar-input-container, +.urlbar-input-container { + border: none !important; + padding: 0 3px !important; + background: none !important; +} + #urlbar[breakout][breakout-extend] { - width: 360px !important; + width: var(--urlbar-width) !important; z-index: 5 !important; padding: 0 !important; border-radius: 8px !important; @@ -69,14 +101,9 @@ toolbarspring { } #urlbar[breakout][breakout-extend] #urlbar-input-container, -#urlbar[breakout][breakout-extend] .urlbar-input-container { +#urlbar[breakout][breakout-extend] > .urlbar-input-container { height: 32px !important; max-height: 32px !important; - padding: 0 !important; -} - -#urlbar:-moz-window-inactive { - border-color: var(--gnome-inactive-headerbar-background) !important; } #urlbar-input, @@ -115,68 +142,97 @@ toolbarspring { border: 0 !important; } -.urlbarView-row-inner, .urlbarView-no-wrap { +.urlbarView-row-inner, +.urlbarView-no-wrap { align-items: center !important; } + .urlbarView-row-inner { padding-block: 5px !important; border-radius: 5px !important; } + +.urlbarView-row { + border: none !important; + border-radius: 5px !important; + + &[row-selectable]:not([selected]):hover { + background-color: var(--gnome-button-hover-color) !important; + } + + &[selected] { + background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.16)) !important; + color: light-dark(#1f1f1f, #f5f5f5) !important; + } +} + +.urlbarView-row[selected] > .urlbarView-row-inner, +.urlbarView-row[selected] :is(.urlbarView-title, .urlbarView-title-separator, .urlbarView-url, .urlbarView-action, .urlbarView-secondary) { + color: inherit !important; +} + .urlbarView-action { background: transparent !important; } + /* Search engines buttons */ .search-one-offs { margin: 0 0 2px !important; padding: 8px !important; background: var(--gnome-popover-background) !important; - border-top: 1px solid var(--gnome-button-border-color) !important; + border-top: 1px solid var(--gnome-toolbar-border-color) !important; border-radius: 0 0 8px 8px !important; } .searchbar-engine-one-off-item { - --toolbarbutton-active-background: var(--gnome-headerbar-button-active-background) !important; - --toolbarbutton-hover-background: var(--gnome-headerbar-button-hover-background) !important; + --toolbarbutton-active-background: var(--gnome-button-hover-background) !important; + --toolbarbutton-hover-background: var(--gnome-button-active-background) !important; -moz-appearance: none !important; - background: transparent !important; - box-shadow: none !important; - border: none !important; - padding: 0 !important; - min-height: 32px !important; - min-width: 32px !important; + background-image: var(--gnome-button-background) !important; + box-shadow: var(--gnome-button-box-shadow) !important; + border: 1px solid var(--gnome-button-border-color) !important; + border-left-width: 0 !important; + border-bottom-color: var(--gnome-button-border-bottom-color) !important; + padding: 0 2px !important; + min-height: 34px !important; + min-width: 34px !important; margin: 0 !important; + border-radius: 0 !important; } -.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { - background: var(--gnome-headerbar-button-hover-background) !important; +.searchbar-engine-one-off-item:hover, +.searchbar-engine-one-off-item[selected] { + background-image: var(--gnome-button-hover-background) !important; color: unset !important; } -#urlbar-anon-search-settings-compact { - border: none !important; - border-radius: 5px; +.searchbar-engine-one-off-item:first-child { + border-radius: 5px 0 0 5px !important; + border-left-width: 1px !important; +} + +.searchbar-engine-one-off-item.last-engine, +.searchbar-engine-one-off-item:not(.search-setting-button):last-child { + border-radius: 0 5px 5px 0 !important; +} + +#urlbar-anon-search-settings-compact, +.search-setting-button { + border-left-width: 1px !important; + border-bottom: 1px solid var(--gnome-button-border-bottom-color) !important; + border-radius: 5px !important; margin-left: 6px !important; } -#identity-box[pageproxystate="invalid"] > .identity-box-button, -#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button { - padding-inline: 6px !important; -} - /* URL bar and Search bar */ -#urlbar[focused], -#searchbar:focus-within { - outline: none !important; - border: none !important; - box-shadow: none !important; -} - #urlbar[focused] .urlbar-textbox-container { margin: -1px !important; } + #searchbar > .searchbar-textbox[focused] .searchbar-search-button { margin-left: -1px !important; } + #searchbar > .searchbar-textbox[focused] .search-go-button { margin-right: -1px !important; } @@ -193,61 +249,104 @@ toolbarspring { fill-opacity: 1 !important; } -#notification-popup-box { - height: 26px !important; - border-radius: 5px !important; +.notification-anchor-icon { + padding: 0 !important; } -.urlbar-page-action, -#urlbar-go-button, -.urlbar-go-button, .search-go-button, -#tracking-protection-icon-container { - width: 28px !important; - height: 26px !important; - margin: 3px 0 !important; +.identity-box-button, +#notification-popup-box, +#tracking-protection-icon-container, +#trust-icon-container { + min-width: 28px !important; + min-height: 26px !important; + margin: 3px 3px 3px 0 !important; padding: 4px 6px !important; border-radius: 5px !important; } -#identity-box { - margin: 3px 2px !important; +#trust-icon-container { + display: flex !important; + align-items: center !important; + justify-content: center !important; +} + +#urlbar:not([pageproxystate="valid"]) #trust-icon-container { + display: none !important; +} + +#trust-icon-container:not(.secure):not(.insecure) { + display: none !important; +} + +.urlbar-page-action, +.urlbar-revert-button, +#star-button-box, +#urlbar-go-button, +.urlbar-go-button:not(.urlbar-icon) { + width: 28px !important; + height: 26px !important; + min-width: 28px !important; + min-height: 26px !important; + margin: 3px 0 3px 3px !important; + padding: 4px 6px !important; border-radius: 5px !important; } -#identity-box[pageproxystate="valid"].chromeUI { - margin-left: 0 !important; +.urlbar-go-button.urlbar-icon { + width: 16px !important; + height: 16px !important; + padding: 4px 6px !important; + border-radius: 5px !important; + margin: 3px 0 !important; +} + +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button, +#urlbar-label-box { + background-color: var(--gnome-headerbar-button-combined-background) !important; + color: var(--gnome-urlbar-color) !important; + border-radius: 5px !important; +} + +#identity-icon-box.identity-box-button { + max-width: calc(28px + 13em) !important; } #tracking-protection-icon-container:hover, .urlbar-page-action:hover, +.urlbar-revert-button:hover, #urlbar-go-button:hover, .urlbar-go-button:hover, .search-go-button:hover, -#identity-box:hover { +.identity-box-button:hover, +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:hover, +#urlbar-label-box:hover { background: var(--gnome-headerbar-button-hover-background) !important; } #tracking-protection-icon-container:active, -#tracking-protection-icon-container[open="true"], .urlbar-page-action:active, +.urlbar-revert-button:active, #urlbar-go-button:active, .urlbar-go-button:active, .search-go-button:active, -#identity-box:active { +.identity-box-button:active, +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:active, +#urlbar-label-box:active { background: var(--gnome-headerbar-button-active-background) !important; } -.identity-box-button { - border-radius: 5px !important; - background: none !important; +#tracking-protection-icon-container[open="true"], +.urlbar-page-action[open="true"], +.urlbar-revert-button[open="true"], +#urlbar-go-button[open="true"], +.urlbar-go-button[open="true"], +.search-go-button[open="true"], +.identity-box-button[open="true"] { + background: var(--gnome-headerbar-button-checked-background) !important; } -#identity-box.extensionPage #identity-icon-label { - visibility: collapse !important; -} - -/* Search mode switcher */ +/* Search mode indicator */ #nav-bar #urlbar toolbarbutton#urlbar-searchmode-switcher:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button):not(.close-button) { appearance: none; border-radius: 5px !important; @@ -258,47 +357,47 @@ toolbarspring { padding-inline: var(--urlbar-searchmodeswitcher-inline-padding); min-width: 50px !important; min-height: 26px !important; + box-shadow: none !important; - &.close-button { - margin-left: 6px !important; - } + &.close-button { + margin-left: 6px !important; + } - &:focus-visible { - outline: var(--focus-outline); - outline-offset: var(--focus-outline-inset); - } + &:focus-visible { + outline: var(--focus-outline); + outline-offset: var(--focus-outline-inset); + } - &[open] { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + &[open] { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* No need space if page information icons such as lock and shield is shown */ - #urlbar[pageproxystate=valid] & { - margin-inline-end: 0; - } + /* No need space if page information icons such as lock and shield is shown */ + #urlbar[pageproxystate=valid] & { + margin-inline-end: 0; + } - #urlbar[searchmode] & { - background-color: var(--urlbar-box-bgcolor) !important; - margin-inline-end: 0 !important; - border-start-end-radius: 0 !important; - border-end-end-radius: 0 !important; - min-width: 32px !important; - } + #urlbar[searchmode] & { + background-color: var(--gnome-headerbar-button-hover-background) !important; + margin-inline-end: 0 !important; + border-start-end-radius: 0 !important; + border-end-end-radius: 0 !important; + min-width: 32px !important; + } - /* The background rule should match to #searchmode-switcher-chicklet */ - #urlbar[focused] & { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + /* The background rule should match to #searchmode-switcher-chicklet */ + #urlbar[focused] & { + background-color: var(--gnome-headerbar-button-hover-background) !important; + } - /* stylelint-disable media-query-no-invalid */ - @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and - (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { - display: none; - } + /* stylelint-disable media-query-no-invalid */ + @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { + display: none; + } } #searchmode-switcher-chicklet { - background-color: var(--urlbar-box-bgcolor); + background-color: var(--gnome-headerbar-button-combined-background) !important; border-start-end-radius: 5px !important; border-end-end-radius: 5px !important; align-items: center; @@ -307,17 +406,26 @@ toolbarspring { display: none; margin-top: 3px; margin-bottom: 3px; + padding-left: 6px; } -#urlbar-search-mode-indicator-close, #searchmode-switcher-close { +#searchmode-switcher-chicklet:-moz-window-inactive { + background: none !important; +} + +#urlbar-search-mode-indicator-close, +#searchmode-switcher-close, +.searchmode-switcher-close { margin-left: 6px !important; + border-radius: 5px !important; } -.urlbar-page-action { - padding: 5px 6px !important; +#urlbar-search-mode-indicator-close { + background-size: 12px 12px !important; + opacity: 0.8 !important; + fill: var(--gnome-toolbar-color) !important; } -/* Search mode indicator */ #urlbar-search-mode-indicator, #urlbar-label-box { background: var(--gnome-headerbar-button-hover-background) !important; @@ -327,46 +435,61 @@ toolbarspring { margin-top: 3px !important; margin-bottom: 3px !important; } + #urlbar-search-mode-indicator-title { - padding-inline: 4px !important;; -} -#urlbar-search-mode-indicator-close { - background-size: 12px 12px !important; - border-radius: 3px !important; - opacity: 0.8 !important; - fill: var(--gnome-toolbar-color) !important; + padding-inline: 4px !important; } /*translations-button*/ #translations-button[translationsactive] > #translations-button-icon { - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; } #translations-button-circle-arrows { - height: 16px; - width: 16px; - list-style-image: url("chrome://browser/skin/sync.svg"); - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; - margin-inline: 1px; + height: 16px; + width: 16px; + list-style-image: url("chrome://browser/skin/sync.svg"); + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; + margin-inline: 1px; } #translations-button-locale { - background-color: var(--theme-primary-active-color) !important; - color: white !important; - border-radius: 4px; - font-size: 0.8em; - height: 20px; - min-width: 20px; - text-align: center; - padding-top: 3px; - padding-inline: 1px; - box-sizing: border-box; - margin-inline: 2px -2px; - margin-block: -2px; + background-color: var(--theme-primary-active-color) !important; + color: white !important; + border-radius: 4px; + font-size: 0.8em; + height: 20px; + min-width: 20px; + text-align: center; + padding-top: 3px; + padding-inline: 1px; + box-sizing: border-box; + margin-inline: 2px -2px; + margin-block: -2px; } #translations-button[translationsactive="true"] { - width: auto !important; + width: auto !important; } + +#main-button .button-background.labelled { + min-height: 26px !important; + min-width: 28px !important; + background: var(--gnome-headerbar-button-hover-background) !important; + border: none !important; + border-radius: 5px !important; + outline: 0 !important; + margin: 0 !important; + padding: 0 9px !important; +} + +@media -moz-pref("browser.urlbar.trustPanel.featureGate") { + #trust-icon-container { + border-radius: 5px !important; + height: 26px !important; + min-width: 28px !important; + margin: 3px 0 !important; + } +} \ No newline at end of file diff --git a/other/firefox/Monterey/parts/tabsbar-alt.css b/other/firefox/Monterey/parts/tabsbar-alt.css index fff1317f..410df7b9 100644 --- a/other/firefox/Monterey/parts/tabsbar-alt.css +++ b/other/firefox/Monterey/parts/tabsbar-alt.css @@ -309,8 +309,8 @@ tab[selected]:-moz-window-inactive .tab-label { max-width: 100% !important; } -.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), -.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { +.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), +.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { max-width: .1px !important; } @@ -364,10 +364,17 @@ tab[selected]:-moz-window-inactive .tab-label { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: none !important; - padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; margin-inline-start: 0 !important; } +#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { + padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; +} + +#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { + padding-inline-start: 0 !important; +} + #firefox-view-button { border-radius: 8px !important; background: var(--gnome-tabbar-tab-background) !important; diff --git a/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/other/firefox/WhiteSur/parts/headerbar-urlbar.css index a6960822..d58b8f54 100644 --- a/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -13,6 +13,8 @@ toolbarspring { --urlbar-container-height: 32px !important; --urlbar-toolbar-height: 32px !important; --urlbar-inner-padding: 0 !important; + --urlbar-box-hover-bgcolor: var(--gnome-headerbar-button-hover-background) !important; + --urlbar-box-active-bgcolor: var(--gnome-headerbar-button-active-background) !important; box-shadow: none !important; border: none !important; padding: 0 !important; @@ -33,6 +35,18 @@ toolbarspring { padding: 0 !important; } +[focused]:not([suppress-focus-border]) > .urlbar-background, +#searchbar:focus-within { + outline-color: var(--gnome-focused-urlbar-border-color) !important; + -moz-outline-radius: 8px !important; + border-radius: 8px !important; +} + +[focused]:not([suppress-focus-border]):hover > .urlbar-background, +#searchbar:focus-within:hover { + outline-color: transparent !important; +} + #urlbar-input-container, .urlbar-input-container { border: none !important; @@ -98,7 +112,8 @@ toolbarspring { border: 0 !important; } -.urlbarView-row-inner, .urlbarView-no-wrap { +.urlbarView-row-inner, +.urlbarView-no-wrap { align-items: center !important; } @@ -107,6 +122,25 @@ toolbarspring { border-radius: 5px !important; } +.urlbarView-row { + border: none !important; + border-radius: 5px !important; + + &[row-selectable]:not([selected]):hover { + background-color: var(--gnome-button-hover-color) !important; + } + + &[selected] { + background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.16)) !important; + color: light-dark(#1f1f1f, #f5f5f5) !important; + } +} + +.urlbarView-row[selected] > .urlbarView-row-inner, +.urlbarView-row[selected] :is(.urlbarView-title, .urlbarView-title-separator, .urlbarView-url, .urlbarView-action, .urlbarView-secondary) { + color: inherit !important; +} + .urlbarView-action { background: transparent !important; } @@ -136,7 +170,8 @@ toolbarspring { border-radius: 0 !important; } -.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { +.searchbar-engine-one-off-item:hover, +.searchbar-engine-one-off-item[selected] { background-image: var(--gnome-button-hover-background) !important; color: unset !important; } @@ -146,7 +181,8 @@ toolbarspring { border-left-width: 1px !important; } -.searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:not(.search-setting-button):last-child { +.searchbar-engine-one-off-item.last-engine, +.searchbar-engine-one-off-item:not(.search-setting-button):last-child { border-radius: 0 5px 5px 0 !important; } @@ -158,11 +194,6 @@ toolbarspring { margin-left: 6px !important; } -#identity-box[pageproxystate="invalid"] > .identity-box-button, -#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button { - padding-inline: 6px !important; -} - /* URL bar and Search bar */ #urlbar[focused] .urlbar-textbox-container { margin: -1px !important; @@ -188,29 +219,104 @@ toolbarspring { fill-opacity: 1 !important; } -#notification-popup-box { - height: 26px !important; - width: 28px !important; - padding: 5px !important; - border-radius: 5px !important; -} - .notification-anchor-icon { padding: 0 !important; } -.urlbar-page-action, -#urlbar-go-button, -.urlbar-go-button, .search-go-button, -#tracking-protection-icon-container { - width: 28px !important; - height: 26px !important; - margin: 3px 0 !important; +.identity-box-button, +#notification-popup-box, +#tracking-protection-icon-container, +#trust-icon-container { + min-width: 28px !important; + min-height: 26px !important; + margin: 3px 3px 3px 0 !important; padding: 6px !important; border-radius: 5px !important; } +#trust-icon-container { + display: flex !important; + align-items: center !important; + justify-content: center !important; +} + +#urlbar:not([pageproxystate="valid"]) #trust-icon-container { + display: none !important; +} + +#trust-icon-container:not(.secure):not(.insecure) { + display: none !important; +} + +.urlbar-page-action, +.urlbar-revert-button, +#star-button-box, +#urlbar-go-button, +.urlbar-go-button:not(.urlbar-icon) { + width: 28px !important; + height: 26px !important; + min-width: 28px !important; + min-height: 26px !important; + margin: 3px 0 3px 3px !important; + padding: 6px !important; + border-radius: 5px !important; +} + +.urlbar-go-button.urlbar-icon { + width: 16px !important; + height: 16px !important; + padding: 6px !important; + border-radius: 5px !important; + margin: 3px 0 !important; +} + +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button, +#urlbar-label-box { + background-color: var(--gnome-headerbar-button-combined-background) !important; + color: var(--gnome-urlbar-color) !important; + border-radius: 5px !important; +} + +#identity-icon-box.identity-box-button { + max-width: calc(28px + 13em) !important; +} + +#tracking-protection-icon-container:hover, +.urlbar-page-action:hover, +.urlbar-revert-button:hover, +#urlbar-go-button:hover, +.urlbar-go-button:hover, +.search-go-button:hover, +.identity-box-button:hover, +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:hover, +#urlbar-label-box:hover { + background: var(--gnome-headerbar-button-hover-background) !important; +} + +#tracking-protection-icon-container:active, +.urlbar-page-action:active, +.urlbar-revert-button:active, +#urlbar-go-button:active, +.urlbar-go-button:active, +.search-go-button:active, +.identity-box-button:active, +#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:active, +#urlbar-label-box:active { + background: var(--gnome-headerbar-button-active-background) !important; +} + +#tracking-protection-icon-container[open="true"], +.urlbar-page-action[open="true"], +.urlbar-revert-button[open="true"], +#urlbar-go-button[open="true"], +.urlbar-go-button[open="true"], +.search-go-button[open="true"], +.identity-box-button[open="true"] { + background: var(--gnome-headerbar-button-checked-background) !important; +} + +/* Search mode indicator */ #nav-bar #urlbar toolbarbutton#urlbar-searchmode-switcher:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button):not(.close-button) { appearance: none; border-radius: 5px !important; @@ -221,47 +327,47 @@ toolbarspring { padding-inline: var(--urlbar-searchmodeswitcher-inline-padding); min-width: 50px !important; min-height: 26px !important; + box-shadow: none !important; - &.close-button { - margin-left: 6px !important; - } + &.close-button { + margin-left: 6px !important; + } - &:focus-visible { - outline: var(--focus-outline); - outline-offset: var(--focus-outline-inset); - } + &:focus-visible { + outline: var(--focus-outline); + outline-offset: var(--focus-outline-inset); + } - &[open] { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + &[open] { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* No need space if page information icons such as lock and shield is shown */ - #urlbar[pageproxystate=valid] & { - margin-inline-end: 0; - } + /* No need space if page information icons such as lock and shield is shown */ + #urlbar[pageproxystate=valid] & { + margin-inline-end: 0; + } - #urlbar[searchmode] & { - background-color: var(--urlbar-box-bgcolor) !important; - margin-inline-end: 0 !important; - border-start-end-radius: 0 !important; - border-end-end-radius: 0 !important; - min-width: 32px !important; - } + #urlbar[searchmode] & { + background-color: var(--gnome-headerbar-button-hover-background) !important; + margin-inline-end: 0 !important; + border-start-end-radius: 0 !important; + border-end-end-radius: 0 !important; + min-width: 32px !important; + } - /* The background rule should match to #searchmode-switcher-chicklet */ - #urlbar[focused] & { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + /* The background rule should match to #searchmode-switcher-chicklet */ + #urlbar[focused] & { + background-color: var(--gnome-headerbar-button-hover-background) !important; + } - /* stylelint-disable media-query-no-invalid */ - @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and - (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { - display: none; - } + /* stylelint-disable media-query-no-invalid */ + @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { + display: none; + } } #searchmode-switcher-chicklet { - background-color: var(--urlbar-box-bgcolor); + background-color: var(--gnome-headerbar-button-combined-background) !important; border-start-end-radius: 5px !important; border-end-end-radius: 5px !important; align-items: center; @@ -270,50 +376,26 @@ toolbarspring { display: none; margin-top: 3px; margin-bottom: 3px; + padding-left: 6px; } -#urlbar-search-mode-indicator-close, #searchmode-switcher-close { - margin-left: 6px !important; -} - -.urlbar-page-action { - padding: 5px 6px !important; -} - -#identity-box { - margin: 3px 2px !important; - border-radius: 5px !important; -} - -#identity-box[pageproxystate="valid"].chromeUI { - margin-left: 0 !important; -} - -#tracking-protection-icon-container:hover, -.urlbar-page-action:hover, -#urlbar-go-button:hover, -.urlbar-go-button:hover, -.search-go-button:hover, -#identity-box:hover { - background: var(--gnome-headerbar-button-hover-background) !important; -} - -#tracking-protection-icon-container:active, -#tracking-protection-icon-container[open="true"], -.urlbar-page-action:active, -#urlbar-go-button:active, -.urlbar-go-button:active, -.search-go-button:active, -#identity-box:active { - background: var(--gnome-headerbar-button-active-background) !important; -} - -.identity-box-button { - border-radius: 5px !important; +#searchmode-switcher-chicklet:-moz-window-inactive { background: none !important; } -/* Search mode indicator */ +#urlbar-search-mode-indicator-close, +#searchmode-switcher-close, +.searchmode-switcher-close { + margin-left: 6px !important; + border-radius: 5px !important; +} + +#urlbar-search-mode-indicator-close { + background-size: 12px 12px !important; + opacity: 0.8 !important; + fill: var(--gnome-toolbar-color) !important; +} + #urlbar-search-mode-indicator, #urlbar-label-box { background: var(--gnome-headerbar-button-hover-background) !important; @@ -323,46 +405,61 @@ toolbarspring { margin-top: 3px !important; margin-bottom: 3px !important; } + #urlbar-search-mode-indicator-title { - padding-inline: 4px !important;; -} -#urlbar-search-mode-indicator-close { - background-size: 12px 12px !important; - border-radius: 3px !important; - opacity: 0.8 !important; - fill: var(--gnome-toolbar-color) !important; + padding-inline: 4px !important; } /*translations-button*/ #translations-button[translationsactive] > #translations-button-icon { - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; } #translations-button-circle-arrows { - height: 16px; - width: 16px; - list-style-image: url("chrome://browser/skin/sync.svg"); - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; - margin-inline: 1px; + height: 16px; + width: 16px; + list-style-image: url("chrome://browser/skin/sync.svg"); + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; + margin-inline: 1px; } #translations-button-locale { - background-color: var(--theme-primary-active-color) !important; - color: white !important; - border-radius: 4px; - font-size: 0.8em; - height: 20px; - min-width: 20px; - text-align: center; - padding-top: 3px; - padding-inline: 1px; - box-sizing: border-box; - margin-inline: 2px -2px; - margin-block: -2px; + background-color: var(--theme-primary-active-color) !important; + color: white !important; + border-radius: 4px; + font-size: 0.8em; + height: 20px; + min-width: 20px; + text-align: center; + padding-top: 3px; + padding-inline: 1px; + box-sizing: border-box; + margin-inline: 2px -2px; + margin-block: -2px; } #translations-button[translationsactive="true"] { - width: auto !important; + width: auto !important; } + +#main-button .button-background.labelled { + min-height: 26px !important; + min-width: 28px !important; + background: var(--gnome-headerbar-button-hover-background) !important; + border: none !important; + border-radius: 5px !important; + outline: 0 !important; + margin: 0 !important; + padding: 0 9px !important; +} + +@media -moz-pref("browser.urlbar.trustPanel.featureGate") { + #trust-icon-container { + border-radius: 5px !important; + height: 26px !important; + min-width: 28px !important; + margin: 3px 0 !important; + } +} \ No newline at end of file diff --git a/other/firefox/WhiteSur/parts/tabsbar-adaptive.css b/other/firefox/WhiteSur/parts/tabsbar-adaptive.css index 5b08da91..83245171 100644 --- a/other/firefox/WhiteSur/parts/tabsbar-adaptive.css +++ b/other/firefox/WhiteSur/parts/tabsbar-adaptive.css @@ -248,8 +248,8 @@ toolbarbutton[open=true] { max-width: 100% !important; } -.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), -.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { +.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), +.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { max-width: .1px !important; } @@ -427,10 +427,17 @@ tab[selected]:-moz-window-inactive { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; - padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; margin-inline-start: 0 !important; } +#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { + padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; +} + +#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { + padding-inline-start: 0 !important; +} + #TabsToolbar #firefox-view-button { border-radius: 0 !important; padding: 0 4px !important; diff --git a/other/firefox/WhiteSur/parts/tabsbar.css b/other/firefox/WhiteSur/parts/tabsbar.css index 0e8ec06a..a051e8fe 100644 --- a/other/firefox/WhiteSur/parts/tabsbar.css +++ b/other/firefox/WhiteSur/parts/tabsbar.css @@ -242,8 +242,8 @@ max-width: 100% !important; } - .tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), - .tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { + .tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), + .tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { max-width: .1px !important; } @@ -449,10 +449,17 @@ tab[selected]:-moz-window-inactive { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; - padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; margin-inline-start: 0 !important; } +#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { + padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; +} + +#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { + padding-inline-start: 0 !important; +} + #TabsToolbar #firefox-view-button { border-radius: 0 !important; padding: 0 4px !important; diff --git a/other/firefox/common/parts/dialogs.css b/other/firefox/common/parts/dialogs.css index 9c4a343a..36bdfd5c 100644 --- a/other/firefox/common/parts/dialogs.css +++ b/other/firefox/common/parts/dialogs.css @@ -2,6 +2,33 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +/* Keep common prompts (e.g. beforeunload) on system dialog colors for readability */ +.tab-prompt-dialog .dialogBox, +.content-prompt-dialog .dialogBox, +#window-modal-dialog .dialogBox { + background-color: -moz-dialog !important; + color: -moz-dialogtext !important; +} + +@-moz-document url("chrome://global/content/commonDialog.xhtml") { + :root, + window, + dialog, + #commonDialog, + #dialogGrid, + #infoTitle, + #infoBody { + background-color: -moz-dialog !important; + color: -moz-dialogtext !important; + } + + label, + description { + background-color: transparent !important; + color: -moz-dialogtext !important; + } +} + window { padding: 0 !important; } @@ -52,6 +79,8 @@ dialog[subdialog] { .dialogBox { border-radius: 12px !important; margin: 0 !important; + background-color: var(--gnome-content-page-dialog-background) !important; + color: var(--gnome-content-page-color) !important; &:not(.spotlightBox) { box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px #000000 !important; @@ -61,6 +90,10 @@ dialog[subdialog] { } } +.dialogBox :is(description, label) { + color: inherit !important; +} + .dialogBox window, .dialogBox dialog { background: none !important; } diff --git a/other/firefox/common/parts/icons.css b/other/firefox/common/parts/icons.css index 94b5d8af..ea99ad58 100644 --- a/other/firefox/common/parts/icons.css +++ b/other/firefox/common/parts/icons.css @@ -329,6 +329,9 @@ menu[disabled] > .menu-right { .search-go-button { list-style-image: url("../icons/go-next-symbolic.svg") !important; } +.urlbar-go-button { + content: url("../icons/go-next-symbolic.svg") !important; +} /* Menu button */ #PanelUI-menu-button { list-style-image: url("../icons/open-menu-symbolic.svg") !important; diff --git a/other/firefox/common/parts/popups.css b/other/firefox/common/parts/popups.css index 266ca0aa..ecf78aa9 100644 --- a/other/firefox/common/parts/popups.css +++ b/other/firefox/common/parts/popups.css @@ -7,9 +7,11 @@ menupopup, panel { -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; + --panel-background-color: var(--gnome-menu-background) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; --panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important; + --panel-box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important; /* --panel-shadow-margin: 3px 8px 13px !important; */ --panel-separator-color: var(--gnome-popover-separator-color) !important; --panel-border-color: transparent !important; @@ -24,6 +26,7 @@ menupopup, panel { menupopup { --panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important; + --panel-box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important; } .cui-widget-panelview[id^="PanelUI-webext-"] { @@ -113,14 +116,32 @@ menupopup menu[disabled="true"]:hover { } panel:not([remote]), #BMB_bookmarksPopup { + --panel-background: var(--gnome-popover-background) !important; + --panel-background-color: var(--gnome-popover-background) !important; --arrowpanel-background: var(--gnome-popover-background) !important; } +/* Remove frosted glass from search mode popup */ +*|panel-list, +*|.searchmode-switcher-panel { + background: var(--gnome-popover-background) !important; + border: none !important; + box-shadow: none !important; + filter: none !important; + backdrop-filter: none !important; + -webkit-backdrop-filter: none !important; + margin-left: -8px !important; + padding: 0 6px !important; + width: calc(100% + 16px) !important; + box-sizing: border-box !important; +} + /* Adjust popovers position */ panel[type="arrow"] { appearance: none !important; - background-color: transparent !important; margin: 0 -18px !important; + --panel-shadow-margin: 0 0 0 0 !important; + overflow: visible !important; } /* Style popovers */ @@ -394,6 +415,8 @@ panel[type="autocomplete-richlistbox"] { padding: 0 !important; color: var(--gnome-toolbar-color) !important; margin: 0 !important; + --panel-shadow: none !important; + --panel-box-shadow: none !important; } .autocomplete-richlistbox { @@ -431,5 +454,16 @@ panel[type="autocomplete-richlistbox"] { /* Fixes for menu scrollbox */ arrowscrollbox.menupopup-arrowscrollbox { - height: 100%; + height: auto; + min-height: 0; + max-height: calc(100vh - 24px) !important; +} + +/* Keep long bookmark menus inside viewport and allow scroll buttons to appear */ +menupopup[placespopup="true"]::part(arrowscrollbox), +#BMB_bookmarksPopup::part(arrowscrollbox), +#BMB_bookmarksPopup menupopup::part(arrowscrollbox), +menupopup[placespopup="true"] .menupopup-arrowscrollbox, +#BMB_bookmarksPopup .menupopup-arrowscrollbox { + max-height: min(70vh, 540px) !important; } diff --git a/other/firefox/userChrome-Monterey-alt-adaptive.css b/other/firefox/userChrome-Monterey-alt-adaptive.css index 57697abc..0d130297 100644 --- a/other/firefox/userChrome-Monterey-alt-adaptive.css +++ b/other/firefox/userChrome-Monterey-alt-adaptive.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -@import "Monterey/hide-single-tab.css"; /**/ +/*@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */ diff --git a/other/firefox/userChrome-Monterey-alt-darker.css b/other/firefox/userChrome-Monterey-alt-darker.css index bb6cec8d..6195cd8a 100644 --- a/other/firefox/userChrome-Monterey-alt-darker.css +++ b/other/firefox/userChrome-Monterey-alt-darker.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -@import "Monterey/hide-single-tab.css"; /**/ +/*@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */ diff --git a/other/firefox/userChrome-Monterey-alt.css b/other/firefox/userChrome-Monterey-alt.css index 69a94087..044e99e4 100644 --- a/other/firefox/userChrome-Monterey-alt.css +++ b/other/firefox/userChrome-Monterey-alt.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -@import "Monterey/hide-single-tab.css"; /**/ +/*@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */ From 45e83299c3a95af0a479076f81a3be833e278da4 Mon Sep 17 00:00:00 2001 From: zzxxchen Date: Wed, 1 Jul 2026 15:22:06 +0800 Subject: [PATCH 3/3] Revert "fix: firefox issues" This reverts commit 8096e1bf428e19e964355a1ce9e60d142ddc1f4a. --- .../Monterey/parts/headerbar-urlbar.css | 371 ++++++------------ other/firefox/Monterey/parts/tabsbar-alt.css | 13 +- .../WhiteSur/parts/headerbar-urlbar.css | 325 ++++++--------- .../WhiteSur/parts/tabsbar-adaptive.css | 13 +- other/firefox/WhiteSur/parts/tabsbar.css | 13 +- other/firefox/common/parts/dialogs.css | 33 -- other/firefox/common/parts/icons.css | 3 - other/firefox/common/parts/popups.css | 38 +- .../userChrome-Monterey-alt-adaptive.css | 2 +- .../userChrome-Monterey-alt-darker.css | 2 +- other/firefox/userChrome-Monterey-alt.css | 2 +- 11 files changed, 252 insertions(+), 563 deletions(-) diff --git a/other/firefox/Monterey/parts/headerbar-urlbar.css b/other/firefox/Monterey/parts/headerbar-urlbar.css index 224b28d4..d7ed77d1 100644 --- a/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -2,27 +2,21 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -/* Monterey: hide search container, center URL bar at 360px */ #search-container, toolbarspring { display: none !important; } +/* URL bar */ #urlbar { --urlbar-height: 32px !important; --urlbar-container-height: 32px !important; --urlbar-toolbar-height: 32px !important; --urlbar-inner-padding: 0 !important; --urlbar-width: 360px !important; - --urlbar-box-hover-bgcolor: var(--gnome-headerbar-button-hover-background) !important; - --urlbar-box-active-bgcolor: var(--gnome-headerbar-button-active-background) !important; box-shadow: none !important; - border: none !important; width: 360px !important; min-width: 360px !important; - padding: 0 !important; - padding-block: 0 !important; - padding-inline: 0 !important; } #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background, @@ -50,42 +44,16 @@ toolbarspring { min-width: 360px !important; } -#urlbar:-moz-window-inactive { - border-color: var(--gnome-inactive-headerbar-background) !important; -} - border-color: var(--gnome-inactive-headerbar-background) !important; -} - #urlbar-background, .urlbar-background { box-shadow: none !important; border: none !important; - background: transparent !important; - border-radius: 8px !important; - padding: 0 !important; -} - -[focused]:not([suppress-focus-border]) > .urlbar-background, -#searchbar:focus-within { - outline-color: var(--gnome-focused-urlbar-border-color) !important; - -moz-outline-radius: 8px !important; - border-radius: 8px !important; -} - -[focused]:not([suppress-focus-border]):hover > .urlbar-background, -#searchbar:focus-within:hover { - outline-color: transparent !important; -} - -#urlbar-input-container, -.urlbar-input-container { - border: none !important; - padding: 0 3px !important; background: none !important; + border-radius: 8px !important; } #urlbar[breakout][breakout-extend] { - width: var(--urlbar-width) !important; + width: 360px !important; z-index: 5 !important; padding: 0 !important; border-radius: 8px !important; @@ -101,9 +69,14 @@ toolbarspring { } #urlbar[breakout][breakout-extend] #urlbar-input-container, -#urlbar[breakout][breakout-extend] > .urlbar-input-container { +#urlbar[breakout][breakout-extend] .urlbar-input-container { height: 32px !important; max-height: 32px !important; + padding: 0 !important; +} + +#urlbar:-moz-window-inactive { + border-color: var(--gnome-inactive-headerbar-background) !important; } #urlbar-input, @@ -142,97 +115,68 @@ toolbarspring { border: 0 !important; } -.urlbarView-row-inner, -.urlbarView-no-wrap { +.urlbarView-row-inner, .urlbarView-no-wrap { align-items: center !important; } - .urlbarView-row-inner { padding-block: 5px !important; border-radius: 5px !important; } - -.urlbarView-row { - border: none !important; - border-radius: 5px !important; - - &[row-selectable]:not([selected]):hover { - background-color: var(--gnome-button-hover-color) !important; - } - - &[selected] { - background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.16)) !important; - color: light-dark(#1f1f1f, #f5f5f5) !important; - } -} - -.urlbarView-row[selected] > .urlbarView-row-inner, -.urlbarView-row[selected] :is(.urlbarView-title, .urlbarView-title-separator, .urlbarView-url, .urlbarView-action, .urlbarView-secondary) { - color: inherit !important; -} - .urlbarView-action { background: transparent !important; } - /* Search engines buttons */ .search-one-offs { margin: 0 0 2px !important; padding: 8px !important; background: var(--gnome-popover-background) !important; - border-top: 1px solid var(--gnome-toolbar-border-color) !important; + border-top: 1px solid var(--gnome-button-border-color) !important; border-radius: 0 0 8px 8px !important; } .searchbar-engine-one-off-item { - --toolbarbutton-active-background: var(--gnome-button-hover-background) !important; - --toolbarbutton-hover-background: var(--gnome-button-active-background) !important; + --toolbarbutton-active-background: var(--gnome-headerbar-button-active-background) !important; + --toolbarbutton-hover-background: var(--gnome-headerbar-button-hover-background) !important; -moz-appearance: none !important; - background-image: var(--gnome-button-background) !important; - box-shadow: var(--gnome-button-box-shadow) !important; - border: 1px solid var(--gnome-button-border-color) !important; - border-left-width: 0 !important; - border-bottom-color: var(--gnome-button-border-bottom-color) !important; - padding: 0 2px !important; - min-height: 34px !important; - min-width: 34px !important; + background: transparent !important; + box-shadow: none !important; + border: none !important; + padding: 0 !important; + min-height: 32px !important; + min-width: 32px !important; margin: 0 !important; - border-radius: 0 !important; } -.searchbar-engine-one-off-item:hover, -.searchbar-engine-one-off-item[selected] { - background-image: var(--gnome-button-hover-background) !important; +.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { + background: var(--gnome-headerbar-button-hover-background) !important; color: unset !important; } -.searchbar-engine-one-off-item:first-child { - border-radius: 5px 0 0 5px !important; - border-left-width: 1px !important; -} - -.searchbar-engine-one-off-item.last-engine, -.searchbar-engine-one-off-item:not(.search-setting-button):last-child { - border-radius: 0 5px 5px 0 !important; -} - -#urlbar-anon-search-settings-compact, -.search-setting-button { - border-left-width: 1px !important; - border-bottom: 1px solid var(--gnome-button-border-bottom-color) !important; - border-radius: 5px !important; +#urlbar-anon-search-settings-compact { + border: none !important; + border-radius: 5px; margin-left: 6px !important; } +#identity-box[pageproxystate="invalid"] > .identity-box-button, +#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button { + padding-inline: 6px !important; +} + /* URL bar and Search bar */ +#urlbar[focused], +#searchbar:focus-within { + outline: none !important; + border: none !important; + box-shadow: none !important; +} + #urlbar[focused] .urlbar-textbox-container { margin: -1px !important; } - #searchbar > .searchbar-textbox[focused] .searchbar-search-button { margin-left: -1px !important; } - #searchbar > .searchbar-textbox[focused] .search-go-button { margin-right: -1px !important; } @@ -249,104 +193,61 @@ toolbarspring { fill-opacity: 1 !important; } -.notification-anchor-icon { - padding: 0 !important; -} - -.search-go-button, -.identity-box-button, -#notification-popup-box, -#tracking-protection-icon-container, -#trust-icon-container { - min-width: 28px !important; - min-height: 26px !important; - margin: 3px 3px 3px 0 !important; - padding: 4px 6px !important; +#notification-popup-box { + height: 26px !important; border-radius: 5px !important; } -#trust-icon-container { - display: flex !important; - align-items: center !important; - justify-content: center !important; -} - -#urlbar:not([pageproxystate="valid"]) #trust-icon-container { - display: none !important; -} - -#trust-icon-container:not(.secure):not(.insecure) { - display: none !important; -} - .urlbar-page-action, -.urlbar-revert-button, -#star-button-box, #urlbar-go-button, -.urlbar-go-button:not(.urlbar-icon) { +.urlbar-go-button, +.search-go-button, +#tracking-protection-icon-container { width: 28px !important; height: 26px !important; - min-width: 28px !important; - min-height: 26px !important; - margin: 3px 0 3px 3px !important; - padding: 4px 6px !important; - border-radius: 5px !important; -} - -.urlbar-go-button.urlbar-icon { - width: 16px !important; - height: 16px !important; - padding: 4px 6px !important; - border-radius: 5px !important; margin: 3px 0 !important; -} - -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button, -#urlbar-label-box { - background-color: var(--gnome-headerbar-button-combined-background) !important; - color: var(--gnome-urlbar-color) !important; + padding: 4px 6px !important; border-radius: 5px !important; } - -#identity-icon-box.identity-box-button { - max-width: calc(28px + 13em) !important; + +#identity-box { + margin: 3px 2px !important; + border-radius: 5px !important; +} + +#identity-box[pageproxystate="valid"].chromeUI { + margin-left: 0 !important; } #tracking-protection-icon-container:hover, .urlbar-page-action:hover, -.urlbar-revert-button:hover, #urlbar-go-button:hover, .urlbar-go-button:hover, .search-go-button:hover, -.identity-box-button:hover, -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:hover, -#urlbar-label-box:hover { +#identity-box:hover { background: var(--gnome-headerbar-button-hover-background) !important; } #tracking-protection-icon-container:active, +#tracking-protection-icon-container[open="true"], .urlbar-page-action:active, -.urlbar-revert-button:active, #urlbar-go-button:active, .urlbar-go-button:active, .search-go-button:active, -.identity-box-button:active, -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:active, -#urlbar-label-box:active { +#identity-box:active { background: var(--gnome-headerbar-button-active-background) !important; } -#tracking-protection-icon-container[open="true"], -.urlbar-page-action[open="true"], -.urlbar-revert-button[open="true"], -#urlbar-go-button[open="true"], -.urlbar-go-button[open="true"], -.search-go-button[open="true"], -.identity-box-button[open="true"] { - background: var(--gnome-headerbar-button-checked-background) !important; +.identity-box-button { + border-radius: 5px !important; + background: none !important; } -/* Search mode indicator */ +#identity-box.extensionPage #identity-icon-label { + visibility: collapse !important; +} + +/* Search mode switcher */ #nav-bar #urlbar toolbarbutton#urlbar-searchmode-switcher:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button):not(.close-button) { appearance: none; border-radius: 5px !important; @@ -357,47 +258,47 @@ toolbarspring { padding-inline: var(--urlbar-searchmodeswitcher-inline-padding); min-width: 50px !important; min-height: 26px !important; - box-shadow: none !important; - &.close-button { - margin-left: 6px !important; - } + &.close-button { + margin-left: 6px !important; + } - &:focus-visible { - outline: var(--focus-outline); - outline-offset: var(--focus-outline-inset); - } + &:focus-visible { + outline: var(--focus-outline); + outline-offset: var(--focus-outline-inset); + } - &[open] { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + &[open] { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* No need space if page information icons such as lock and shield is shown */ - #urlbar[pageproxystate=valid] & { - margin-inline-end: 0; - } + /* No need space if page information icons such as lock and shield is shown */ + #urlbar[pageproxystate=valid] & { + margin-inline-end: 0; + } - #urlbar[searchmode] & { - background-color: var(--gnome-headerbar-button-hover-background) !important; - margin-inline-end: 0 !important; - border-start-end-radius: 0 !important; - border-end-end-radius: 0 !important; - min-width: 32px !important; - } + #urlbar[searchmode] & { + background-color: var(--urlbar-box-bgcolor) !important; + margin-inline-end: 0 !important; + border-start-end-radius: 0 !important; + border-end-end-radius: 0 !important; + min-width: 32px !important; + } - /* The background rule should match to #searchmode-switcher-chicklet */ - #urlbar[focused] & { - background-color: var(--gnome-headerbar-button-hover-background) !important; - } + /* The background rule should match to #searchmode-switcher-chicklet */ + #urlbar[focused] & { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* stylelint-disable media-query-no-invalid */ - @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { - display: none; - } + /* stylelint-disable media-query-no-invalid */ + @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and + (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { + display: none; + } } #searchmode-switcher-chicklet { - background-color: var(--gnome-headerbar-button-combined-background) !important; + background-color: var(--urlbar-box-bgcolor); border-start-end-radius: 5px !important; border-end-end-radius: 5px !important; align-items: center; @@ -406,26 +307,17 @@ toolbarspring { display: none; margin-top: 3px; margin-bottom: 3px; - padding-left: 6px; } -#searchmode-switcher-chicklet:-moz-window-inactive { - background: none !important; -} - -#urlbar-search-mode-indicator-close, -#searchmode-switcher-close, -.searchmode-switcher-close { +#urlbar-search-mode-indicator-close, #searchmode-switcher-close { margin-left: 6px !important; - border-radius: 5px !important; } -#urlbar-search-mode-indicator-close { - background-size: 12px 12px !important; - opacity: 0.8 !important; - fill: var(--gnome-toolbar-color) !important; +.urlbar-page-action { + padding: 5px 6px !important; } +/* Search mode indicator */ #urlbar-search-mode-indicator, #urlbar-label-box { background: var(--gnome-headerbar-button-hover-background) !important; @@ -435,61 +327,46 @@ toolbarspring { margin-top: 3px !important; margin-bottom: 3px !important; } - #urlbar-search-mode-indicator-title { - padding-inline: 4px !important; + padding-inline: 4px !important;; +} +#urlbar-search-mode-indicator-close { + background-size: 12px 12px !important; + border-radius: 3px !important; + opacity: 0.8 !important; + fill: var(--gnome-toolbar-color) !important; } /*translations-button*/ #translations-button[translationsactive] > #translations-button-icon { - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; } #translations-button-circle-arrows { - height: 16px; - width: 16px; - list-style-image: url("chrome://browser/skin/sync.svg"); - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; - margin-inline: 1px; + height: 16px; + width: 16px; + list-style-image: url("chrome://browser/skin/sync.svg"); + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; + margin-inline: 1px; } #translations-button-locale { - background-color: var(--theme-primary-active-color) !important; - color: white !important; - border-radius: 4px; - font-size: 0.8em; - height: 20px; - min-width: 20px; - text-align: center; - padding-top: 3px; - padding-inline: 1px; - box-sizing: border-box; - margin-inline: 2px -2px; - margin-block: -2px; + background-color: var(--theme-primary-active-color) !important; + color: white !important; + border-radius: 4px; + font-size: 0.8em; + height: 20px; + min-width: 20px; + text-align: center; + padding-top: 3px; + padding-inline: 1px; + box-sizing: border-box; + margin-inline: 2px -2px; + margin-block: -2px; } #translations-button[translationsactive="true"] { - width: auto !important; + width: auto !important; } - -#main-button .button-background.labelled { - min-height: 26px !important; - min-width: 28px !important; - background: var(--gnome-headerbar-button-hover-background) !important; - border: none !important; - border-radius: 5px !important; - outline: 0 !important; - margin: 0 !important; - padding: 0 9px !important; -} - -@media -moz-pref("browser.urlbar.trustPanel.featureGate") { - #trust-icon-container { - border-radius: 5px !important; - height: 26px !important; - min-width: 28px !important; - margin: 3px 0 !important; - } -} \ No newline at end of file diff --git a/other/firefox/Monterey/parts/tabsbar-alt.css b/other/firefox/Monterey/parts/tabsbar-alt.css index 410df7b9..fff1317f 100644 --- a/other/firefox/Monterey/parts/tabsbar-alt.css +++ b/other/firefox/Monterey/parts/tabsbar-alt.css @@ -309,8 +309,8 @@ tab[selected]:-moz-window-inactive .tab-label { max-width: 100% !important; } -.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), -.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { +.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), +.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { max-width: .1px !important; } @@ -364,15 +364,8 @@ tab[selected]:-moz-window-inactive .tab-label { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: none !important; - margin-inline-start: 0 !important; -} - -#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; -} - -#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { - padding-inline-start: 0 !important; + margin-inline-start: 0 !important; } #firefox-view-button { diff --git a/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/other/firefox/WhiteSur/parts/headerbar-urlbar.css index d58b8f54..a6960822 100644 --- a/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -13,8 +13,6 @@ toolbarspring { --urlbar-container-height: 32px !important; --urlbar-toolbar-height: 32px !important; --urlbar-inner-padding: 0 !important; - --urlbar-box-hover-bgcolor: var(--gnome-headerbar-button-hover-background) !important; - --urlbar-box-active-bgcolor: var(--gnome-headerbar-button-active-background) !important; box-shadow: none !important; border: none !important; padding: 0 !important; @@ -35,18 +33,6 @@ toolbarspring { padding: 0 !important; } -[focused]:not([suppress-focus-border]) > .urlbar-background, -#searchbar:focus-within { - outline-color: var(--gnome-focused-urlbar-border-color) !important; - -moz-outline-radius: 8px !important; - border-radius: 8px !important; -} - -[focused]:not([suppress-focus-border]):hover > .urlbar-background, -#searchbar:focus-within:hover { - outline-color: transparent !important; -} - #urlbar-input-container, .urlbar-input-container { border: none !important; @@ -112,8 +98,7 @@ toolbarspring { border: 0 !important; } -.urlbarView-row-inner, -.urlbarView-no-wrap { +.urlbarView-row-inner, .urlbarView-no-wrap { align-items: center !important; } @@ -122,25 +107,6 @@ toolbarspring { border-radius: 5px !important; } -.urlbarView-row { - border: none !important; - border-radius: 5px !important; - - &[row-selectable]:not([selected]):hover { - background-color: var(--gnome-button-hover-color) !important; - } - - &[selected] { - background-color: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.16)) !important; - color: light-dark(#1f1f1f, #f5f5f5) !important; - } -} - -.urlbarView-row[selected] > .urlbarView-row-inner, -.urlbarView-row[selected] :is(.urlbarView-title, .urlbarView-title-separator, .urlbarView-url, .urlbarView-action, .urlbarView-secondary) { - color: inherit !important; -} - .urlbarView-action { background: transparent !important; } @@ -170,8 +136,7 @@ toolbarspring { border-radius: 0 !important; } -.searchbar-engine-one-off-item:hover, -.searchbar-engine-one-off-item[selected] { +.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { background-image: var(--gnome-button-hover-background) !important; color: unset !important; } @@ -181,8 +146,7 @@ toolbarspring { border-left-width: 1px !important; } -.searchbar-engine-one-off-item.last-engine, -.searchbar-engine-one-off-item:not(.search-setting-button):last-child { +.searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:not(.search-setting-button):last-child { border-radius: 0 5px 5px 0 !important; } @@ -194,6 +158,11 @@ toolbarspring { margin-left: 6px !important; } +#identity-box[pageproxystate="invalid"] > .identity-box-button, +#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] > .identity-box-button { + padding-inline: 6px !important; +} + /* URL bar and Search bar */ #urlbar[focused] .urlbar-textbox-container { margin: -1px !important; @@ -219,104 +188,29 @@ toolbarspring { fill-opacity: 1 !important; } +#notification-popup-box { + height: 26px !important; + width: 28px !important; + padding: 5px !important; + border-radius: 5px !important; +} + .notification-anchor-icon { padding: 0 !important; } -.search-go-button, -.identity-box-button, -#notification-popup-box, -#tracking-protection-icon-container, -#trust-icon-container { - min-width: 28px !important; - min-height: 26px !important; - margin: 3px 3px 3px 0 !important; - padding: 6px !important; - border-radius: 5px !important; -} - -#trust-icon-container { - display: flex !important; - align-items: center !important; - justify-content: center !important; -} - -#urlbar:not([pageproxystate="valid"]) #trust-icon-container { - display: none !important; -} - -#trust-icon-container:not(.secure):not(.insecure) { - display: none !important; -} - .urlbar-page-action, -.urlbar-revert-button, -#star-button-box, #urlbar-go-button, -.urlbar-go-button:not(.urlbar-icon) { +.urlbar-go-button, +.search-go-button, +#tracking-protection-icon-container { width: 28px !important; height: 26px !important; - min-width: 28px !important; - min-height: 26px !important; - margin: 3px 0 3px 3px !important; - padding: 6px !important; - border-radius: 5px !important; -} - -.urlbar-go-button.urlbar-icon { - width: 16px !important; - height: 16px !important; - padding: 6px !important; - border-radius: 5px !important; margin: 3px 0 !important; -} - -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button, -#urlbar-label-box { - background-color: var(--gnome-headerbar-button-combined-background) !important; - color: var(--gnome-urlbar-color) !important; + padding: 6px !important; border-radius: 5px !important; } - -#identity-icon-box.identity-box-button { - max-width: calc(28px + 13em) !important; -} -#tracking-protection-icon-container:hover, -.urlbar-page-action:hover, -.urlbar-revert-button:hover, -#urlbar-go-button:hover, -.urlbar-go-button:hover, -.search-go-button:hover, -.identity-box-button:hover, -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:hover, -#urlbar-label-box:hover { - background: var(--gnome-headerbar-button-hover-background) !important; -} - -#tracking-protection-icon-container:active, -.urlbar-page-action:active, -.urlbar-revert-button:active, -#urlbar-go-button:active, -.urlbar-go-button:active, -.search-go-button:active, -.identity-box-button:active, -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:active, -#urlbar-label-box:active { - background: var(--gnome-headerbar-button-active-background) !important; -} - -#tracking-protection-icon-container[open="true"], -.urlbar-page-action[open="true"], -.urlbar-revert-button[open="true"], -#urlbar-go-button[open="true"], -.urlbar-go-button[open="true"], -.search-go-button[open="true"], -.identity-box-button[open="true"] { - background: var(--gnome-headerbar-button-checked-background) !important; -} - -/* Search mode indicator */ #nav-bar #urlbar toolbarbutton#urlbar-searchmode-switcher:not(#urlbar-zoom-button):not(.subviewbutton):not(.titlebar-button):not(.close-button) { appearance: none; border-radius: 5px !important; @@ -327,47 +221,47 @@ toolbarspring { padding-inline: var(--urlbar-searchmodeswitcher-inline-padding); min-width: 50px !important; min-height: 26px !important; - box-shadow: none !important; - &.close-button { - margin-left: 6px !important; - } + &.close-button { + margin-left: 6px !important; + } - &:focus-visible { - outline: var(--focus-outline); - outline-offset: var(--focus-outline-inset); - } + &:focus-visible { + outline: var(--focus-outline); + outline-offset: var(--focus-outline-inset); + } - &[open] { - background-color: var(--urlbar-box-focus-bgcolor) !important; - } + &[open] { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* No need space if page information icons such as lock and shield is shown */ - #urlbar[pageproxystate=valid] & { - margin-inline-end: 0; - } + /* No need space if page information icons such as lock and shield is shown */ + #urlbar[pageproxystate=valid] & { + margin-inline-end: 0; + } - #urlbar[searchmode] & { - background-color: var(--gnome-headerbar-button-hover-background) !important; - margin-inline-end: 0 !important; - border-start-end-radius: 0 !important; - border-end-end-radius: 0 !important; - min-width: 32px !important; - } + #urlbar[searchmode] & { + background-color: var(--urlbar-box-bgcolor) !important; + margin-inline-end: 0 !important; + border-start-end-radius: 0 !important; + border-end-end-radius: 0 !important; + min-width: 32px !important; + } - /* The background rule should match to #searchmode-switcher-chicklet */ - #urlbar[focused] & { - background-color: var(--gnome-headerbar-button-hover-background) !important; - } + /* The background rule should match to #searchmode-switcher-chicklet */ + #urlbar[focused] & { + background-color: var(--urlbar-box-focus-bgcolor) !important; + } - /* stylelint-disable media-query-no-invalid */ - @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { - display: none; - } + /* stylelint-disable media-query-no-invalid */ + @media (not -moz-pref("browser.urlbar.searchModeSwitcher.featureGate")) and + (not -moz-pref("browser.urlbar.scotchBonnet.enableOverride")) { + display: none; + } } #searchmode-switcher-chicklet { - background-color: var(--gnome-headerbar-button-combined-background) !important; + background-color: var(--urlbar-box-bgcolor); border-start-end-radius: 5px !important; border-end-end-radius: 5px !important; align-items: center; @@ -376,26 +270,50 @@ toolbarspring { display: none; margin-top: 3px; margin-bottom: 3px; - padding-left: 6px; } -#searchmode-switcher-chicklet:-moz-window-inactive { - background: none !important; -} - -#urlbar-search-mode-indicator-close, -#searchmode-switcher-close, -.searchmode-switcher-close { +#urlbar-search-mode-indicator-close, #searchmode-switcher-close { margin-left: 6px !important; +} + +.urlbar-page-action { + padding: 5px 6px !important; +} + +#identity-box { + margin: 3px 2px !important; border-radius: 5px !important; } -#urlbar-search-mode-indicator-close { - background-size: 12px 12px !important; - opacity: 0.8 !important; - fill: var(--gnome-toolbar-color) !important; +#identity-box[pageproxystate="valid"].chromeUI { + margin-left: 0 !important; } +#tracking-protection-icon-container:hover, +.urlbar-page-action:hover, +#urlbar-go-button:hover, +.urlbar-go-button:hover, +.search-go-button:hover, +#identity-box:hover { + background: var(--gnome-headerbar-button-hover-background) !important; +} + +#tracking-protection-icon-container:active, +#tracking-protection-icon-container[open="true"], +.urlbar-page-action:active, +#urlbar-go-button:active, +.urlbar-go-button:active, +.search-go-button:active, +#identity-box:active { + background: var(--gnome-headerbar-button-active-background) !important; +} + +.identity-box-button { + border-radius: 5px !important; + background: none !important; +} + +/* Search mode indicator */ #urlbar-search-mode-indicator, #urlbar-label-box { background: var(--gnome-headerbar-button-hover-background) !important; @@ -405,61 +323,46 @@ toolbarspring { margin-top: 3px !important; margin-bottom: 3px !important; } - #urlbar-search-mode-indicator-title { - padding-inline: 4px !important; + padding-inline: 4px !important;; +} +#urlbar-search-mode-indicator-close { + background-size: 12px 12px !important; + border-radius: 3px !important; + opacity: 0.8 !important; + fill: var(--gnome-toolbar-color) !important; } /*translations-button*/ #translations-button[translationsactive] > #translations-button-icon { - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; } #translations-button-circle-arrows { - height: 16px; - width: 16px; - list-style-image: url("chrome://browser/skin/sync.svg"); - fill: var(--theme-primary-active-color) !important; - fill-opacity: 1; - margin-inline: 1px; + height: 16px; + width: 16px; + list-style-image: url("chrome://browser/skin/sync.svg"); + fill: var(--theme-primary-active-color) !important; + fill-opacity: 1; + margin-inline: 1px; } #translations-button-locale { - background-color: var(--theme-primary-active-color) !important; - color: white !important; - border-radius: 4px; - font-size: 0.8em; - height: 20px; - min-width: 20px; - text-align: center; - padding-top: 3px; - padding-inline: 1px; - box-sizing: border-box; - margin-inline: 2px -2px; - margin-block: -2px; + background-color: var(--theme-primary-active-color) !important; + color: white !important; + border-radius: 4px; + font-size: 0.8em; + height: 20px; + min-width: 20px; + text-align: center; + padding-top: 3px; + padding-inline: 1px; + box-sizing: border-box; + margin-inline: 2px -2px; + margin-block: -2px; } #translations-button[translationsactive="true"] { - width: auto !important; + width: auto !important; } - -#main-button .button-background.labelled { - min-height: 26px !important; - min-width: 28px !important; - background: var(--gnome-headerbar-button-hover-background) !important; - border: none !important; - border-radius: 5px !important; - outline: 0 !important; - margin: 0 !important; - padding: 0 9px !important; -} - -@media -moz-pref("browser.urlbar.trustPanel.featureGate") { - #trust-icon-container { - border-radius: 5px !important; - height: 26px !important; - min-width: 28px !important; - margin: 3px 0 !important; - } -} \ No newline at end of file diff --git a/other/firefox/WhiteSur/parts/tabsbar-adaptive.css b/other/firefox/WhiteSur/parts/tabsbar-adaptive.css index 83245171..5b08da91 100644 --- a/other/firefox/WhiteSur/parts/tabsbar-adaptive.css +++ b/other/firefox/WhiteSur/parts/tabsbar-adaptive.css @@ -248,8 +248,8 @@ toolbarbutton[open=true] { max-width: 100% !important; } -.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), -.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { +.tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), +.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { max-width: .1px !important; } @@ -427,15 +427,8 @@ tab[selected]:-moz-window-inactive { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; - margin-inline-start: 0 !important; -} - -#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; -} - -#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { - padding-inline-start: 0 !important; + margin-inline-start: 0 !important; } #TabsToolbar #firefox-view-button { diff --git a/other/firefox/WhiteSur/parts/tabsbar.css b/other/firefox/WhiteSur/parts/tabsbar.css index a051e8fe..0e8ec06a 100644 --- a/other/firefox/WhiteSur/parts/tabsbar.css +++ b/other/firefox/WhiteSur/parts/tabsbar.css @@ -242,8 +242,8 @@ max-width: 100% !important; } - .tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]), - .tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]):not([selected], [visuallyselected], [multiselected]) { + .tabbrowser-tab:not([style^="max-width"]):not([pinned]):not([fadein]), + .tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]):not([fadein]) { max-width: .1px !important; } @@ -449,15 +449,8 @@ tab[selected]:-moz-window-inactive { toolbarpaletteitem:not(#wrapper-firefox-view-button) ) + #tabbrowser-tabs { border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important; - margin-inline-start: 0 !important; -} - -#TabsToolbar #tabbrowser-tabs[haspinnedtabs] { padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width)) !important; -} - -#TabsToolbar #tabbrowser-tabs:not([haspinnedtabs]) { - padding-inline-start: 0 !important; + margin-inline-start: 0 !important; } #TabsToolbar #firefox-view-button { diff --git a/other/firefox/common/parts/dialogs.css b/other/firefox/common/parts/dialogs.css index 36bdfd5c..9c4a343a 100644 --- a/other/firefox/common/parts/dialogs.css +++ b/other/firefox/common/parts/dialogs.css @@ -2,33 +2,6 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -/* Keep common prompts (e.g. beforeunload) on system dialog colors for readability */ -.tab-prompt-dialog .dialogBox, -.content-prompt-dialog .dialogBox, -#window-modal-dialog .dialogBox { - background-color: -moz-dialog !important; - color: -moz-dialogtext !important; -} - -@-moz-document url("chrome://global/content/commonDialog.xhtml") { - :root, - window, - dialog, - #commonDialog, - #dialogGrid, - #infoTitle, - #infoBody { - background-color: -moz-dialog !important; - color: -moz-dialogtext !important; - } - - label, - description { - background-color: transparent !important; - color: -moz-dialogtext !important; - } -} - window { padding: 0 !important; } @@ -79,8 +52,6 @@ dialog[subdialog] { .dialogBox { border-radius: 12px !important; margin: 0 !important; - background-color: var(--gnome-content-page-dialog-background) !important; - color: var(--gnome-content-page-color) !important; &:not(.spotlightBox) { box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px #000000 !important; @@ -90,10 +61,6 @@ dialog[subdialog] { } } -.dialogBox :is(description, label) { - color: inherit !important; -} - .dialogBox window, .dialogBox dialog { background: none !important; } diff --git a/other/firefox/common/parts/icons.css b/other/firefox/common/parts/icons.css index ea99ad58..94b5d8af 100644 --- a/other/firefox/common/parts/icons.css +++ b/other/firefox/common/parts/icons.css @@ -329,9 +329,6 @@ menu[disabled] > .menu-right { .search-go-button { list-style-image: url("../icons/go-next-symbolic.svg") !important; } -.urlbar-go-button { - content: url("../icons/go-next-symbolic.svg") !important; -} /* Menu button */ #PanelUI-menu-button { list-style-image: url("../icons/open-menu-symbolic.svg") !important; diff --git a/other/firefox/common/parts/popups.css b/other/firefox/common/parts/popups.css index ecf78aa9..266ca0aa 100644 --- a/other/firefox/common/parts/popups.css +++ b/other/firefox/common/parts/popups.css @@ -7,11 +7,9 @@ menupopup, panel { -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; - --panel-background-color: var(--gnome-menu-background) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; --panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important; - --panel-box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important; /* --panel-shadow-margin: 3px 8px 13px !important; */ --panel-separator-color: var(--gnome-popover-separator-color) !important; --panel-border-color: transparent !important; @@ -26,7 +24,6 @@ menupopup, panel { menupopup { --panel-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important; - --panel-box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-menu-border-color) !important; } .cui-widget-panelview[id^="PanelUI-webext-"] { @@ -116,32 +113,14 @@ menupopup menu[disabled="true"]:hover { } panel:not([remote]), #BMB_bookmarksPopup { - --panel-background: var(--gnome-popover-background) !important; - --panel-background-color: var(--gnome-popover-background) !important; --arrowpanel-background: var(--gnome-popover-background) !important; } -/* Remove frosted glass from search mode popup */ -*|panel-list, -*|.searchmode-switcher-panel { - background: var(--gnome-popover-background) !important; - border: none !important; - box-shadow: none !important; - filter: none !important; - backdrop-filter: none !important; - -webkit-backdrop-filter: none !important; - margin-left: -8px !important; - padding: 0 6px !important; - width: calc(100% + 16px) !important; - box-sizing: border-box !important; -} - /* Adjust popovers position */ panel[type="arrow"] { appearance: none !important; + background-color: transparent !important; margin: 0 -18px !important; - --panel-shadow-margin: 0 0 0 0 !important; - overflow: visible !important; } /* Style popovers */ @@ -415,8 +394,6 @@ panel[type="autocomplete-richlistbox"] { padding: 0 !important; color: var(--gnome-toolbar-color) !important; margin: 0 !important; - --panel-shadow: none !important; - --panel-box-shadow: none !important; } .autocomplete-richlistbox { @@ -454,16 +431,5 @@ panel[type="autocomplete-richlistbox"] { /* Fixes for menu scrollbox */ arrowscrollbox.menupopup-arrowscrollbox { - height: auto; - min-height: 0; - max-height: calc(100vh - 24px) !important; -} - -/* Keep long bookmark menus inside viewport and allow scroll buttons to appear */ -menupopup[placespopup="true"]::part(arrowscrollbox), -#BMB_bookmarksPopup::part(arrowscrollbox), -#BMB_bookmarksPopup menupopup::part(arrowscrollbox), -menupopup[placespopup="true"] .menupopup-arrowscrollbox, -#BMB_bookmarksPopup .menupopup-arrowscrollbox { - max-height: min(70vh, 540px) !important; + height: 100%; } diff --git a/other/firefox/userChrome-Monterey-alt-adaptive.css b/other/firefox/userChrome-Monterey-alt-adaptive.css index 0d130297..57697abc 100644 --- a/other/firefox/userChrome-Monterey-alt-adaptive.css +++ b/other/firefox/userChrome-Monterey-alt-adaptive.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -/*@import "Monterey/hide-single-tab.css"; /**/ +@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */ diff --git a/other/firefox/userChrome-Monterey-alt-darker.css b/other/firefox/userChrome-Monterey-alt-darker.css index 6195cd8a..bb6cec8d 100644 --- a/other/firefox/userChrome-Monterey-alt-darker.css +++ b/other/firefox/userChrome-Monterey-alt-darker.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -/*@import "Monterey/hide-single-tab.css"; /**/ +@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */ diff --git a/other/firefox/userChrome-Monterey-alt.css b/other/firefox/userChrome-Monterey-alt.css index 044e99e4..69a94087 100644 --- a/other/firefox/userChrome-Monterey-alt.css +++ b/other/firefox/userChrome-Monterey-alt.css @@ -13,7 +13,7 @@ /* Hide the tab bar when only one tab is open (GNOMISH) * You should move the new tab button somewhere else for this to work, because by * default it is on the tab bar too. */ -/*@import "Monterey/hide-single-tab.css"; /**/ +@import "Monterey/hide-single-tab.css"; /**/ /* Limit the URL bar's autocompletion popup's width to the URL bar's width (GNOMISH) * This feature is included by default for Firefox 70+ */