From f306e5f6d9c8f44f57bcf54649c96a7bf10bcd7a Mon Sep 17 00:00:00 2001 From: Vince Date: Sun, 5 Jul 2026 11:07:59 +0800 Subject: [PATCH] Fixed #1406 Fixed #1405 --- .../Monterey/parts/headerbar-urlbar.css | 55 ++++- other/firefox/Monterey/parts/tabsbar-alt.css | 15 ++ other/firefox/Monterey/parts/tabsbar.css | 19 ++ .../WhiteSur/parts/headerbar-urlbar.css | 193 +++++++++++------- other/firefox/WhiteSur/parts/tabsbar.css | 23 +++ other/firefox/common/parts/icons.css | 3 + other/firefox/common/parts/popups.css | 6 +- 7 files changed, 230 insertions(+), 84 deletions(-) diff --git a/other/firefox/Monterey/parts/headerbar-urlbar.css b/other/firefox/Monterey/parts/headerbar-urlbar.css index d7ed77d1..50578134 100644 --- a/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -200,23 +200,29 @@ toolbarspring { .urlbar-page-action, #urlbar-go-button, -.urlbar-go-button, +.urlbar-go-button:not(.urlbar-icon), .search-go-button, -#tracking-protection-icon-container { +#notification-popup-box, +#tracking-protection-icon-container, +#trust-icon-container { width: 28px !important; height: 26px !important; margin: 3px 0 !important; - padding: 4px 6px !important; + padding: 6px !important; border-radius: 5px !important; } -#identity-box { - margin: 3px 2px !important; - border-radius: 5px !important; +.urlbar-page-action { + padding: 5px 6px !important; } -#identity-box[pageproxystate="valid"].chromeUI { - margin-left: 0 !important; +.urlbar-go-button.urlbar-icon { + width: 16px !important; + height: 16px !important; + padding: 7px !important; + border-radius: 5px !important; + margin: 3px 0 !important; + background: none !important; } #tracking-protection-icon-container:hover, @@ -238,13 +244,42 @@ toolbarspring { background: var(--gnome-headerbar-button-active-background) !important; } +#identity-box.extensionPage #identity-icon-label { + visibility: collapse !important; +} + +#identity-box { + margin: 3px 2px !important; + border-radius: 5px !important; +} + +#identity-box[pageproxystate="valid"].chromeUI { + margin-left: 0 !important; +} + .identity-box-button { border-radius: 5px !important; background: none !important; } -#identity-box.extensionPage #identity-icon-label { - visibility: collapse !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; + /* min-height: 26px !important; + min-width: 28px !important; */ + margin: 3px 0 !important; + } } /* Search mode switcher */ diff --git a/other/firefox/Monterey/parts/tabsbar-alt.css b/other/firefox/Monterey/parts/tabsbar-alt.css index fff1317f..f56e0e1e 100644 --- a/other/firefox/Monterey/parts/tabsbar-alt.css +++ b/other/firefox/Monterey/parts/tabsbar-alt.css @@ -386,6 +386,21 @@ tab[selected]:-moz-window-inactive .tab-label { outline: none !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; +} + +#tabbrowser-tabs[orient="horizontal"]::before { + display: none !important; + border-inline-start: none !important; + padding-inline-start: 0 !important; + margin-inline-start: 0 !important; +} + /*Tab Group*/ tab-group { #tabbrowser-tabs[orient="horizontal"] &[collapsed] > .tabbrowser-tab { diff --git a/other/firefox/Monterey/parts/tabsbar.css b/other/firefox/Monterey/parts/tabsbar.css index c57e9ef5..67aefc36 100644 --- a/other/firefox/Monterey/parts/tabsbar.css +++ b/other/firefox/Monterey/parts/tabsbar.css @@ -228,6 +228,10 @@ tab[selected]:-moz-window-inactive .tab-label { border-radius: 8px !important; } +#TabsToolbar #alltabs-button { + padding: 0 !important; +} + #TabsToolbar .toolbarbutton-1 image, #TabsToolbar #tabs-newtab-button image, #TabsToolbar #new-tab-button image { @@ -266,6 +270,21 @@ tab[selected]:-moz-window-inactive .tab-label { outline: none !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; +} + +#tabbrowser-tabs[orient="horizontal"]::before { + display: none !important; + border-inline-start: none !important; + padding-inline-start: 0 !important; + margin-inline-start: 0 !important; +} + /* Remove shadow next to tab scroll buttons */ .arrowscrollbox-overflow-start-indicator, .arrowscrollbox-overflow-end-indicator { diff --git a/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/other/firefox/WhiteSur/parts/headerbar-urlbar.css index a6960822..487fde17 100644 --- a/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -98,7 +98,8 @@ toolbarspring { border: 0 !important; } -.urlbarView-row-inner, .urlbarView-no-wrap { +.urlbarView-row-inner, +.urlbarView-no-wrap { align-items: center !important; } @@ -136,7 +137,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 +148,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; } @@ -199,18 +202,6 @@ toolbarspring { 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; - padding: 6px !important; - border-radius: 5px !important; -} - #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; @@ -222,42 +213,41 @@ toolbarspring { min-width: 50px !important; min-height: 26px !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(--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(--urlbar-box-focus-bgcolor) !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 { @@ -272,21 +262,47 @@ toolbarspring { margin-bottom: 3px; } -#urlbar-search-mode-indicator-close, #searchmode-switcher-close { +#urlbar-search-mode-indicator-close, +#searchmode-switcher-close { margin-left: 6px !important; } +.urlbar-page-action, +#urlbar-go-button, +.urlbar-go-button:not(.urlbar-icon), +.search-go-button, +#notification-popup-box, +#tracking-protection-icon-container, +#trust-icon-container { + width: 28px !important; + height: 26px !important; + margin: 3px 0 !important; + padding: 6px !important; + border-radius: 5px !important; +} + .urlbar-page-action { padding: 5px 6px !important; } -#identity-box { - margin: 3px 2px !important; +.urlbar-go-button.urlbar-icon { + width: 16px !important; + height: 16px !important; + padding: 7px !important; + border-radius: 5px !important; + margin: 3px 0 !important; + background: none !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-box[pageproxystate="valid"].chromeUI { - margin-left: 0 !important; +#identity-icon-box.identity-box-button { + max-width: calc(30px + 13em) !important; } #tracking-protection-icon-container:hover, @@ -308,11 +324,40 @@ toolbarspring { background: var(--gnome-headerbar-button-active-background) !important; } +#identity-box { + margin: 3px 2px !important; + border-radius: 5px !important; +} + +#identity-box[pageproxystate="valid"].chromeUI { + margin-left: 0 !important; +} + .identity-box-button { border-radius: 5px !important; background: none !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; + /* min-height: 26px !important; + min-width: 28px !important; */ + margin: 3px 0 !important; + } +} + /* Search mode indicator */ #urlbar-search-mode-indicator, #urlbar-label-box { @@ -323,9 +368,11 @@ 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; @@ -335,34 +382,34 @@ toolbarspring { /*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; +} \ No newline at end of file diff --git a/other/firefox/WhiteSur/parts/tabsbar.css b/other/firefox/WhiteSur/parts/tabsbar.css index 0e8ec06a..9ba490ba 100644 --- a/other/firefox/WhiteSur/parts/tabsbar.css +++ b/other/firefox/WhiteSur/parts/tabsbar.css @@ -279,6 +279,14 @@ } } +.tab-audio-button { + --button-border-radius: 999px !important; + + .button-background { + border-radius: 999px !important; + } +} + :root[tabsintitlebar][inFullscreen] #TabsToolbar .toolbar-items { margin-bottom: 0 !important; } @@ -453,6 +461,21 @@ tab[selected]:-moz-window-inactive { 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; +} + +#tabbrowser-tabs[orient="horizontal"]::before { + display: none !important; + border-inline-start: none !important; + padding-inline-start: 0 !important; + margin-inline-start: 0 !important; +} + #TabsToolbar #firefox-view-button { border-radius: 0 !important; padding: 0 4px !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..e04151fe 100644 --- a/other/firefox/common/parts/popups.css +++ b/other/firefox/common/parts/popups.css @@ -7,10 +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-shadow-margin: 3px 8px 13px !important; */ + --panel-box-shadow: var(--gnome-popover-shadow), 0 0 0 1px var(--gnome-popover-border-color) !important; --panel-separator-color: var(--gnome-popover-separator-color) !important; --panel-border-color: transparent !important; --panel-color: var(--gnome-toolbar-color) !important; @@ -24,6 +25,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,6 +115,8 @@ 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; }