From 182bce9bbab9d580abda5dbec1aee4f1e115fe63 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 9 Oct 2022 18:40:57 +0800 Subject: [PATCH] Fixed #690 --- src/other/firefox/Monterey/parts/popups.css | 34 ++++++++++++++++----- src/other/firefox/WhiteSur/colors/dark.css | 1 + src/other/firefox/WhiteSur/colors/light.css | 4 +-- src/other/firefox/WhiteSur/parts/popups.css | 34 ++++++++++++++++----- 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 7db7537..1e9bff9 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -12,6 +12,12 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 8px !important; --panel-padding: 8px 0 !important; + -moz-appearance: none !important; + color: var(--gnome-toolbar-color) !important; +} + +menupopup label { + color: var(--gnome-toolbar-color) !important; } #PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { @@ -141,10 +147,11 @@ panel:not([remote]), #BMB_bookmarksPopup { .subviewbutton:not(.subviewbutton-back), .toolbarbutton-1, .protections-popup-category, .identity-popup-content-blocking-category { - border-radius: 8px !important; + border-radius: 6px !important; color: var(--gnome-toolbar-color) !important; font: menu !important; } + .subviewbutton:not(.subviewbutton-back), .protections-popup-category, .identity-popup-content-blocking-category { @@ -152,11 +159,13 @@ panel:not([remote]), #BMB_bookmarksPopup { margin: 0 !important; } -.subviewbutton[disabled], .toolbarbutton-1[disabled], -.protections-popup-category[disabled], -.identity-popup-content-blocking-category[disabled] { +/* Menu buttons disabled */ +menuitem[disabled="true"], menupopup menu[disabled="true"], +.subviewbutton[disabled="true"], .toolbarbutton-1[disabled="true"], +.protections-popup-category[disabled="true"], +.identity-popup-content-blocking-category[disabled="true"] { opacity: 0.5 !important; - color: var(--gnome-inactive-toolbar-color) !important; +/* color: var(--gnome-inactive-toolbar-color) !important;*/ background: none !important; } @@ -164,9 +173,18 @@ panel:not([remote]), #BMB_bookmarksPopup { opacity: 0.5 !important; } -.subviewbutton:not([disabled]):hover, .toolbarbutton-1:not([disabled]):hover, .protections-popup-category:not([disabled]):hover, -.identity-popup-content-blocking-category:not([disabled]):hover { - background-color: var(--gnome-popover-button-hover-background) !important; +/* Menu buttons hover */ +.toolbarbutton-1:not([disabled]):hover, +menuitem:not([disabled="true"]):is(:hover, [_moz-menuactive]), +menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), +.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover, +.protections-popup-footer-button:not([disabled="true"]):hover, +#protections-popup-show-report-stack:hover .protections-popup-footer-button, +.protections-popup-category:not([disabled="true"]):hover, +.identity-popup-content-blocking-category:not([disabled="true"]):hover, +#PlacesToolbar .bookmark-item:is(:hover, [open], [_moz-menuactive]), +#downloadsPanel-mainView .download-state:hover { + background: var(--gnome-popover-button-hover-background) !important; } /* Style popover separators */ diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index 685245f..b09e295 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -17,6 +17,7 @@ --gnome-findbar-background: #333333; --gnome-toolbar-color: #ffffff; --gnome-toolbar-border-color: #070707; + --gnome-inactive-toolbar-color: rgba(255, 255, 255, 0.45); --gnome-inactive-toolbar-background: #313131; --gnome-inactive-toolbar-border-color: #121212; diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css index 0d69c7d..6e05c69 100644 --- a/src/other/firefox/WhiteSur/colors/light.css +++ b/src/other/firefox/WhiteSur/colors/light.css @@ -14,9 +14,9 @@ --gnome-toolbar-background: #ffffff; --gnome-tabstoolbar-background: #E5E5E5; --gnome-findbar-background: #f5f5f5; - --gnome-toolbar-color: rgb(46, 52, 54); + --gnome-toolbar-color: rgb(46, 46, 46); --gnome-toolbar-border-color: #cfcfcf; - --gnome-inactive-toolbar-color: rgba(46, 52, 54, 0.35); + --gnome-inactive-toolbar-color: rgba(46, 46, 46, 0.65); --gnome-inactive-toolbar-background: #f6f5f4; --gnome-inactive-toolbar-border-color: #dadada; diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 7db7537..1e9bff9 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -12,6 +12,12 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 8px !important; --panel-padding: 8px 0 !important; + -moz-appearance: none !important; + color: var(--gnome-toolbar-color) !important; +} + +menupopup label { + color: var(--gnome-toolbar-color) !important; } #PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { @@ -141,10 +147,11 @@ panel:not([remote]), #BMB_bookmarksPopup { .subviewbutton:not(.subviewbutton-back), .toolbarbutton-1, .protections-popup-category, .identity-popup-content-blocking-category { - border-radius: 8px !important; + border-radius: 6px !important; color: var(--gnome-toolbar-color) !important; font: menu !important; } + .subviewbutton:not(.subviewbutton-back), .protections-popup-category, .identity-popup-content-blocking-category { @@ -152,11 +159,13 @@ panel:not([remote]), #BMB_bookmarksPopup { margin: 0 !important; } -.subviewbutton[disabled], .toolbarbutton-1[disabled], -.protections-popup-category[disabled], -.identity-popup-content-blocking-category[disabled] { +/* Menu buttons disabled */ +menuitem[disabled="true"], menupopup menu[disabled="true"], +.subviewbutton[disabled="true"], .toolbarbutton-1[disabled="true"], +.protections-popup-category[disabled="true"], +.identity-popup-content-blocking-category[disabled="true"] { opacity: 0.5 !important; - color: var(--gnome-inactive-toolbar-color) !important; +/* color: var(--gnome-inactive-toolbar-color) !important;*/ background: none !important; } @@ -164,9 +173,18 @@ panel:not([remote]), #BMB_bookmarksPopup { opacity: 0.5 !important; } -.subviewbutton:not([disabled]):hover, .toolbarbutton-1:not([disabled]):hover, .protections-popup-category:not([disabled]):hover, -.identity-popup-content-blocking-category:not([disabled]):hover { - background-color: var(--gnome-popover-button-hover-background) !important; +/* Menu buttons hover */ +.toolbarbutton-1:not([disabled]):hover, +menuitem:not([disabled="true"]):is(:hover, [_moz-menuactive]), +menupopup menu:not([disabled="true"]):is(:hover, [_moz-menuactive]), +.subviewbutton:not([disabled="true"], #appMenu-zoom-controls2, #appMenu-fxa-label2):hover, +.protections-popup-footer-button:not([disabled="true"]):hover, +#protections-popup-show-report-stack:hover .protections-popup-footer-button, +.protections-popup-category:not([disabled="true"]):hover, +.identity-popup-content-blocking-category:not([disabled="true"]):hover, +#PlacesToolbar .bookmark-item:is(:hover, [open], [_moz-menuactive]), +#downloadsPanel-mainView .download-state:hover { + background: var(--gnome-popover-button-hover-background) !important; } /* Style popover separators */