diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index 754639e1..5ee02658 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -48,14 +48,14 @@ /* Buttons */ --gnome-button-background: linear-gradient(to top, #636363 0%, #696969 100%); --gnome-button-border-color: #282828; - --gnome-button-border-accent-color: #282828; + --gnome-button-border-bottom-color: #282828; --gnome-button-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); --gnome-button-hover-color: rgba(255, 255, 255, 0.1); --gnome-button-active-color: rgba(255, 255, 255, 0.2); --gnome-button-hover-background: linear-gradient(to top, #707070 0%, #737373 100%); --gnome-button-active-background: linear-gradient(to top, #808080 0%, #858585 100%); --gnome-button-active-border-color: #1b1b1b; - --gnome-button-active-border-accent-color: #1b1b1b; + --gnome-button-active-border-bottom-color: #1b1b1b; --gnome-button-active-box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); --gnome-button-disabled-background: linear-gradient(to top, #434343 0%, #494949 100%); --gnome-button-disabled-border-color: #282828; diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css index e933b7ad..ab0fa6c4 100644 --- a/src/other/firefox/WhiteSur/colors/light.css +++ b/src/other/firefox/WhiteSur/colors/light.css @@ -47,13 +47,14 @@ /* Buttons */ --gnome-button-background: linear-gradient(to top, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%); --gnome-button-border-color: #cfcfcf; - --gnome-button-border-accent-color: #cfcfcf; + --gnome-button-border-bottom-color: #cfcfcf; --gnome-button-box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.03); --gnome-button-hover-color: rgba(0, 0, 0, 0.1); --gnome-button-active-color: rgba(0, 0, 0, 0.2); --gnome-button-hover-background: linear-gradient(to top, #fdfdfd 0%, #ffffff 100%); --gnome-button-active-background: #cfcfcf; --gnome-button-active-border-color: #b2b2b1; + --gnome-button-active-border-bottom-color: #b2b2b1; --gnome-button-active-box-shadow: 0 1px rgba(255, 255, 255, 0) inset; --gnome-button-disabled-background: #faf9f8; --gnome-button-disabled-border-color: #cfcfcf; diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css index 8a576100..958223e0 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -117,8 +117,8 @@ toolbarspring { } .searchbar-engine-one-off-item { - --toolbarbutton-active-background: transparent !important; - --toolbarbutton-hover-background: transparent !important; + --toolbarbutton-active-background: var(--gnome-button-hover-background) !important; + --toolbarbutton-hover-background: var(--gnome-button-active-background) !important; -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; diff --git a/src/other/firefox/common/pages/newtab-adaptive.css b/src/other/firefox/common/pages/newtab-adaptive.css new file mode 100644 index 00000000..6392567b --- /dev/null +++ b/src/other/firefox/common/pages/newtab-adaptive.css @@ -0,0 +1,40 @@ +/* about:newtab */ + +.context-menu { + background: var(--gnome-menu-background) !important; + border-radius: 12px !important; + box-shadow: var(--gnome-popover-shadow) !important; + padding: 6px !important; +} + +@media (prefers-color-scheme: dark) { + .context-menu { + border: 1px solid rgba(255, 255, 255, 0.06) !important; + } +} + +.context-menu > ul { + padding: 0 !important; +} + +.context-menu > ul > li > a, +.context-menu > ul > li > button { + border-radius: 6px !important; + padding: 6px 12px !important; +} + +.context-menu > ul > li.separator { + border-bottom: 1px solid var(--gnome-popover-separator-color) !important; +} + +.home-section .section .switch { + width: 30px !important; + height: 20px !important; +} + +.home-section .section .slider::before { + height: 12px !important; + width: 12px !important; + inset-inline-start: 3px; + bottom: 3px; +} diff --git a/src/other/firefox/common/parts/popups-contents.css b/src/other/firefox/common/parts/popups-contents.css index 53992967..19db60f3 100644 --- a/src/other/firefox/common/parts/popups-contents.css +++ b/src/other/firefox/common/parts/popups-contents.css @@ -321,7 +321,7 @@ /* Extensions sometimes assume a white background */ .webextension-popup-browser { - background-color: #fff !important; + background-color: #ffffff !important; } #downloads-indicator-progress-inner { diff --git a/src/other/firefox/common/parts/popups.css b/src/other/firefox/common/parts/popups.css index d91a9b22..e053dbd4 100644 --- a/src/other/firefox/common/parts/popups.css +++ b/src/other/firefox/common/parts/popups.css @@ -235,6 +235,19 @@ menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), background: var(--gnome-popover-button-hover-background) !important; } +/* Menu buttons active */ +menuitem:not([disabled="true"]):is(:active, [_moz-menuactive]), +menupopup menu:not([disabled="true"]):is(:active, [_moz-menuactive]), +.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):active, +.protections-popup-footer-button:not([disabled="true"]):active, +#protections-popup-show-report-stack:active .protections-popup-footer-button, +.protections-popup-category:not([disabled="true"]):active, +.identity-popup-content-blocking-category:not([disabled="true"]):active, +#PlacesToolbar .bookmark-item:is(:active, [open], [_moz-menuactive]), +#downloadsPanel-mainView .download-state:active { + background: var(--gnome-popover-button-active-background) !important; +} + /* Style popover separators */ toolbarseparator, menuseparator { appearance: none !important; diff --git a/src/other/firefox/userContent-Monterey-adaptive.css b/src/other/firefox/userContent-Monterey-adaptive.css index 4eb72a48..740a638b 100644 --- a/src/other/firefox/userContent-Monterey-adaptive.css +++ b/src/other/firefox/userContent-Monterey-adaptive.css @@ -1,7 +1,4 @@ @import "Monterey/colors/light-adaptive.css"; @import "Monterey/colors/dark-adaptive.css"; -@import "Monterey/pages/common.css"; -@import "Monterey/pages/newtab.css"; -@import "Monterey/pages/reader.css"; -@import "Monterey/pages/privatebrowsing.css"; +@import "Monterey/pages/newtab-adaptive.css"; diff --git a/src/other/firefox/userContent-WhiteSur-adaptive.css b/src/other/firefox/userContent-WhiteSur-adaptive.css index 28bd0b7e..9e1c7e7f 100644 --- a/src/other/firefox/userContent-WhiteSur-adaptive.css +++ b/src/other/firefox/userContent-WhiteSur-adaptive.css @@ -1,7 +1,4 @@ @import "WhiteSur/colors/light-adaptive.css"; @import "WhiteSur/colors/dark-adaptive.css"; -@import "WhiteSur/pages/common.css"; -@import "WhiteSur/pages/newtab.css"; -@import "WhiteSur/pages/reader.css"; -@import "WhiteSur/pages/privatebrowsing.css"; +@import "WhiteSur/pages/newtab-adaptive.css"; diff --git a/src/other/firefox/userContent-WhiteSur.css b/src/other/firefox/userContent-WhiteSur.css index d4dcfbf0..3cbf9c19 100644 --- a/src/other/firefox/userContent-WhiteSur.css +++ b/src/other/firefox/userContent-WhiteSur.css @@ -1,7 +1,7 @@ @import "WhiteSur/colors/light.css"; @import "WhiteSur/colors/dark.css"; -@import "WhiteSur/pages/common.css"; -@import "WhiteSur/pages/newtab.css"; -@import "WhiteSur/pages/reader.css"; -@import "WhiteSur/pages/privatebrowsing.css"; +@import "Monterey/pages/common.css"; +@import "Monterey/pages/newtab.css"; +@import "Monterey/pages/reader.css"; +@import "Monterey/pages/privatebrowsing.css"; diff --git a/tweaks.sh b/tweaks.sh index 8eb68bd0..5f37a781 100755 --- a/tweaks.sh +++ b/tweaks.sh @@ -19,6 +19,8 @@ source "${REPO_DIR}/shell/lib-install.sh" colors=("${COLOR_VARIANTS[@]}") opacities=("${OPACITY_VARIANTS[@]}") +firefoxtheme=$THEME_NAME + usage() { # Please specify their default value manually, some of them are come from _variables.scss # You also have to check and update them regurally @@ -102,6 +104,8 @@ while [[ $# -gt 0 ]]; do ;; adaptive) adaptive="true" + prompt -i "Firefox adaptive color version...\n" + prompt -w "You need install adaptive-tab-bar-colour plugin first: https://addons.mozilla.org/firefox/addon/adaptive-tab-bar-colour/\n" shift 1 ;; esac