From 913dc127d35092ce437cee33312de38373a807d2 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 23 Dec 2021 00:43:21 +0900 Subject: [PATCH 1/6] Fix: Win10 system default theme color contrast #296 // Light 218 194 - 24 179 - 15 // Dark 46 69 - 23 81 - 12 --- userChrome.css | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/userChrome.css b/userChrome.css index ed92ad8..8678bea 100644 --- a/userChrome.css +++ b/userChrome.css @@ -297,10 +297,11 @@ :root:not(:-moz-lwtheme) { --win-text-color: rgba(0, 0, 0); --win-bgcolor: rgb(204, 204, 204); - --win-disabled-color: rgb(145, 145, 145); /* also button-active-color */ + --win-disabled-color: rgb(145, 145, 145); --win-disabled-bgcolor: transparent; - --win-hover-bgcolor: rgb(218, 218, 218); - --win-hover-active-bgcolor: #c2c2c2; /* also button-bgcolor */ + --win-hover-bgcolor: rgb(218, 218, 218); /* also button-bgcolor */ + --win-hover-active-bgcolor: #c2c2c2; /* also button-hover-bgcolor */ + --win-button-active-bgcolor: #aaaaaa; --win-field-bgcolor: #ffffff; --win-component-bgcolor: #f2f2f2; --win-border-color: #8a8a8a; @@ -324,10 +325,10 @@ :root[lwt-default-theme-in-dark-mode] { --win-text-color: #ffffff; --win-bgcolor: #2b2b2b; - --win-disabled-color: #747474; /* also button-active-color */ + --win-disabled-color: #747474; --win-disabled-bgcolor: transparent; - --win-hover-bgcolor: #2e2e2e; - --win-hover-active-bgcolor: #454545; /* also button-bgcolor */ + --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */ + --win-hover-active-bgcolor: #454545; /* also button-active-color */ --win-field-bgcolor: #373737; --win-component-bgcolor: #171717; --win-border-color: #5b5b5b; @@ -369,7 +370,6 @@ /* Text Disabled Color */ --menu-disabled-color: var(--win-disabled-color) !important; - --button-active-bgcolor: var(--win-disabled-color) !important; --checkbox-unchecked-active-bgcolor: var(--win-disabled-color) !important; --panel-disabled-color: var(--win-disabled-color) !important; --download-progress-paused-color: var(--win-disabled-color) !important; @@ -402,21 +402,24 @@ --button-primary-color: var(--win-field-bgcolor) !important; --checkbox-checked-color: var(--win-field-bgcolor) !important; - /* Hover Background Color */ + /* Hover Background Color, Button Color */ --menuitem-hover-background-color: var(--win-hover-bgcolor) !important; - --toolbarbutton-hover-background: var(--win-hover-bgcolor) !important; - --panel-banner-item-hover-bgcolor: var(--win-hover-bgcolor) !important; + --button-bgcolor: var(--win-hover-bgcolor) !important; + --panel-banner-item-background-color: var(--win-hover-bgcolor) !important; - /* Hover Active, Button Color */ - --button-bgcolor: var(--win-hover-active-bgcolor) !important; + /* Hover Active, Button Hover Color */ --checkbox-unchecked-bgcolor: var(--win-hover-active-bgcolor) !important; - --panel-banner-item-background-color: var(--win-hover-active-bgcolor) !important; --urlbar-box-bgcolor: var(--win-hover-active-bgcolor) !important; --urlbar-box-focus-bgcolor: var(--win-hover-active-bgcolor) !important; - --panel-banner-item-active-bgcolor: var(--win-hover-active-bgcolor) !important; --toolbarbutton-active-background: var(--win-hover-active-bgcolor) !important; --urlbar-box-active-bgcolor: var(--win-hover-active-bgcolor) !important; --autocomplete-popup-highlight-background: var(--win-hover-active-bgcolor) !important; + --toolbarbutton-hover-background: var(--win-hover-active-bgcolor) !important; + --panel-banner-item-hover-bgcolor: var(--win-hover-active-bgcolor) !important; + + /* Button Hover Active Color */ + --button-active-bgcolor: var(--win-button-active-bgcolor) !important; + --panel-banner-item-active-bgcolor: var(--win-button-active-bgcolor) !important; /* Disabled Background Color */ --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important; @@ -523,12 +526,18 @@ } } + /*- Panel ------------------------------------------------------------------*/ :root:not(:-moz-lwtheme) - .subviewbutton:not(#appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2), + toolbarbutton.subviewbutton:not([disabled], [open], :active, #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is(:hover), :root[lwt-default-theme-in-dark-mode] - .subviewbutton:not(#appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2) { - --button-hover-bgcolor: var(--win-hover-bgcolor) !important; - --button-active-bgcolor: var(--win-hover-active-bgcolor) !important; + toolbarbutton.subviewbutton:not([disabled], [open], :active, #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is(:hover) { + background-color: var(--win-hover-bgcolor) !important; + } + :root:not(:-moz-lwtheme) + toolbarbutton.subviewbutton:not([disabled], #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is([open], :hover:active), + :root[lwt-default-theme-in-dark-mode] + toolbarbutton.subviewbutton:not([disabled], #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is([open], :hover:active) { + background-color: var(--win-hover-active-bgcolor) !important; } /*- Others -----------------------------------------------------------------*/ From a22a05cb2b747f2466ebc633f41e8f872537edda Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 24 Dec 2021 00:54:31 +0900 Subject: [PATCH 2/6] Fix: Win10 color mistake #296 --- userChrome.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/userChrome.css b/userChrome.css index 8678bea..e155d68 100644 --- a/userChrome.css +++ b/userChrome.css @@ -329,6 +329,7 @@ --win-disabled-bgcolor: transparent; --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */ --win-hover-active-bgcolor: #454545; /* also button-active-color */ + --win-button-active-bgcolor: #515151; --win-field-bgcolor: #373737; --win-component-bgcolor: #171717; --win-border-color: #5b5b5b; @@ -404,6 +405,7 @@ /* Hover Background Color, Button Color */ --menuitem-hover-background-color: var(--win-hover-bgcolor) !important; + --toolbarbutton-hover-background: var(--win-hover-bgcolor) !important; --button-bgcolor: var(--win-hover-bgcolor) !important; --panel-banner-item-background-color: var(--win-hover-bgcolor) !important; @@ -414,7 +416,7 @@ --toolbarbutton-active-background: var(--win-hover-active-bgcolor) !important; --urlbar-box-active-bgcolor: var(--win-hover-active-bgcolor) !important; --autocomplete-popup-highlight-background: var(--win-hover-active-bgcolor) !important; - --toolbarbutton-hover-background: var(--win-hover-active-bgcolor) !important; + --button-hover-bgcolor: var(--win-button-active-bgcolor) !important; --panel-banner-item-hover-bgcolor: var(--win-hover-active-bgcolor) !important; /* Button Hover Active Color */ @@ -425,7 +427,6 @@ --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important; /* Button Hover Color */ - --button-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --checkbox-unchecked-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --urlbar-box-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --autocomplete-popup-hover-background: var(--win-button-hover-bgcolor) !important; From 1351fe9a60b2957d27241b24476cfafce779e303 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 24 Dec 2021 01:41:17 +0900 Subject: [PATCH 3/6] Fix: Win10 system default button contrast #296 --- userChrome.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/userChrome.css b/userChrome.css index e155d68..c01f373 100644 --- a/userChrome.css +++ b/userChrome.css @@ -301,6 +301,7 @@ --win-disabled-bgcolor: transparent; --win-hover-bgcolor: rgb(218, 218, 218); /* also button-bgcolor */ --win-hover-active-bgcolor: #c2c2c2; /* also button-hover-bgcolor */ + --win-button-hover-bgcolor: rgba(218, 218, 218, 0.66); --win-button-active-bgcolor: #aaaaaa; --win-field-bgcolor: #ffffff; --win-component-bgcolor: #f2f2f2; @@ -311,7 +312,6 @@ --win-sidebar-button-hover-bgcolor: #b8b8b8; --win-sidebar-button-hover-active-bgcolor: #a3a3a3; --win-button-border: #747474; - --win-button-hover-bgcolor: rgba(145, 145, 145, 0.66); --win-shorcut-text-color: #757575; --win-error-color: #b31616; --win-red-border-color: #ff4343; @@ -329,6 +329,7 @@ --win-disabled-bgcolor: transparent; --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */ --win-hover-active-bgcolor: #454545; /* also button-active-color */ + --win-button-hover-bgcolor: rgba(46, 46, 46, 0.66); --win-button-active-bgcolor: #515151; --win-field-bgcolor: #373737; --win-component-bgcolor: #171717; @@ -339,7 +340,6 @@ --win-sidebar-button-hover-bgcolor: #353535; --win-sidebar-button-hover-active-bgcolor: #4c4c4c; --win-button-border: #8f8f8f; - --win-button-hover-bgcolor: rgba(116, 116, 116, 0.66); --win-shorcut-text-color: #adadad; --win-error-color: #ffb900; --win-red-border-color: #ff4343; @@ -416,7 +416,6 @@ --toolbarbutton-active-background: var(--win-hover-active-bgcolor) !important; --urlbar-box-active-bgcolor: var(--win-hover-active-bgcolor) !important; --autocomplete-popup-highlight-background: var(--win-hover-active-bgcolor) !important; - --button-hover-bgcolor: var(--win-button-active-bgcolor) !important; --panel-banner-item-hover-bgcolor: var(--win-hover-active-bgcolor) !important; /* Button Hover Active Color */ @@ -427,6 +426,7 @@ --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important; /* Button Hover Color */ + --button-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --checkbox-unchecked-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --urlbar-box-hover-bgcolor: var(--win-button-hover-bgcolor) !important; --autocomplete-popup-hover-background: var(--win-button-hover-bgcolor) !important; @@ -528,6 +528,12 @@ } /*- Panel ------------------------------------------------------------------*/ + :root:not(:-moz-lwtheme) .subviewbutton, + :root[lwt-default-theme-in-dark-mode] .subviewbutton { + --button-hover-bgcolor: var(--win-hover-active-bgcolor) !important; + --button-active-bgcolor: var(--win-button-active-bgcolor) !important; + } + :root:not(:-moz-lwtheme) toolbarbutton.subviewbutton:not([disabled], [open], :active, #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is(:hover), :root[lwt-default-theme-in-dark-mode] From d95017cd21b95a78513b32f1f460e796504289b0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 28 Dec 2021 14:26:19 +0900 Subject: [PATCH 4/6] Add: Disabled menu's background color to `transparent` --- userChrome.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/userChrome.css b/userChrome.css index c01f373..eb898ca 100644 --- a/userChrome.css +++ b/userChrome.css @@ -54,6 +54,12 @@ --lwt-toolbarbutton-icon-fill-attention: var(--button-primary-bgcolor, rgb(0, 120, 215)); } +/*= Disabled menu background color ===========================================*/ +menuitem[disabled], +menu[disabled] { + background-color: transparent !important; +} + /*= Remove Tab Border ========================================================*/ /* Light Theme */ #TabsToolbar:not([brighttext]) From 190f7dd414f058f29119d6a352d109b71b9832ae Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 30 Dec 2021 12:11:42 +0900 Subject: [PATCH 5/6] Add: Protection Popup multiView - footer button's icon & cursor --- userChrome.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/userChrome.css b/userChrome.css index eb898ca..691c532 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2531,8 +2531,8 @@ menuitem.openintabs-menuitem, #downloadsListBox .download-state[exists], #downloadsListBox .download-state[exists] .downloadDetails, #downloadsHistory, -#protections-popup-settings-button, -#protections-popup-show-report-button, +#protections-popup-footer .protections-popup-footer-button, +#protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, #identity-popup-more-info { cursor: pointer !important; @@ -4350,7 +4350,8 @@ panelMenuBookmarkThisPage[starred] { margin-inline-end: 1em; } -#protections-popup-settings-button > .protections-popup-settings-icon { +#protections-popup-settings-button > .protections-popup-settings-icon, +#protections-popup-multiView .panel-subview-footer-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } From fab118933e8594ecc017653bb04dd64d7235b398 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 31 Dec 2021 16:15:34 +0900 Subject: [PATCH 6/6] Fix: Icons - `command-pick.svg` at nightly - Before: url("chrome://devtools/skin/images/command-pick.svg") - After: url("chrome://devtools/content/shared/images/command-pick.svg") --- icons/command-pick.svg | 7 +++++++ userChrome.css | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 icons/command-pick.svg diff --git a/icons/command-pick.svg b/icons/command-pick.svg new file mode 100644 index 0000000..2b0ba00 --- /dev/null +++ b/icons/command-pick.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/userChrome.css b/userChrome.css index 691c532..d25b3a5 100644 --- a/userChrome.css +++ b/userChrome.css @@ -5062,7 +5062,7 @@ menuitem.viewCustomizeToolbar { --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); } #context-inspect { - --menuitem-image: url("chrome://devtools/skin/images/command-pick.svg"); + --menuitem-image: url("./icons/command-pick.svg"); } #context-media-eme-learnmore {