From b59ed7b89d3bb923bf3815588f9c48602689ba15 Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:54:58 +0800 Subject: [PATCH 01/10] Add console and eyedropper icons --- icons/command-console.svg | 1 + icons/command-eyedropper.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 icons/command-console.svg create mode 100644 icons/command-eyedropper.svg diff --git a/icons/command-console.svg b/icons/command-console.svg new file mode 100644 index 00000000..6e8a445f --- /dev/null +++ b/icons/command-console.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/command-eyedropper.svg b/icons/command-eyedropper.svg new file mode 100644 index 00000000..708e127e --- /dev/null +++ b/icons/command-eyedropper.svg @@ -0,0 +1 @@ + \ No newline at end of file From 1109403c792e5ded4936d7d462b4c52fd9afd4f5 Mon Sep 17 00:00:00 2001 From: Zap <134786889+zapSNH@users.noreply.github.com> Date: Thu, 21 Dec 2023 11:53:35 +0800 Subject: [PATCH 02/10] Add 1.25px icons for 1.5px icons --- icons/firefox-view.svg | 1 + icons/flame.svg | 1 + icons/tab-photon.svg | 4 +--- icons/translations.svg | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 icons/firefox-view.svg create mode 100644 icons/flame.svg create mode 100644 icons/translations.svg diff --git a/icons/firefox-view.svg b/icons/firefox-view.svg new file mode 100644 index 00000000..a3da0d09 --- /dev/null +++ b/icons/firefox-view.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/flame.svg b/icons/flame.svg new file mode 100644 index 00000000..dd1062cf --- /dev/null +++ b/icons/flame.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/tab-photon.svg b/icons/tab-photon.svg index 2b0c392d..c9199598 100644 --- a/icons/tab-photon.svg +++ b/icons/tab-photon.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/icons/translations.svg b/icons/translations.svg new file mode 100644 index 00000000..155c55fe --- /dev/null +++ b/icons/translations.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9e01bc6e9793ea7f49226a868e10689dd948743f Mon Sep 17 00:00:00 2001 From: zapSNH <134786889+zapSNH@users.noreply.github.com> Date: Thu, 21 Dec 2023 12:28:36 +0800 Subject: [PATCH 03/10] Add: Icons - Update old Photon Icons --- css/leptonChrome.css | 28 ++++++++++++++-------------- css/leptonChromeESR.css | 14 +++++++------- src/icons/_global_menu.scss | 6 +++--- src/icons/_panel.scss | 8 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 768ace0a..58153ac2 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10940,7 +10940,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -11166,7 +11166,7 @@ /* Browser Console */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) { - list-style-image: url("chrome://devtools/skin/images/command-console.svg"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -11176,7 +11176,7 @@ /* Eyedropper */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) { - list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -11186,7 +11186,7 @@ /* Extensions for Devel */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) { - list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; @@ -13024,7 +13024,7 @@ --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -13032,13 +13032,13 @@ } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ #windowPopup > menuitem[command="minimizeWindow"] { @@ -25345,7 +25345,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -25653,7 +25653,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appmenu-developer-tools-view .subviewbutton:nth-last-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) { - list-style-image: url("chrome://devtools/skin/images/command-console.svg"); + list-style-image: url("../icons/command-console.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25665,7 +25665,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appmenu-developer-tools-view .subviewbutton:nth-last-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) { - list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + list-style-image: url("../icons/command-eyedropper.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25677,7 +25677,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appmenu-developer-tools-view .subviewbutton:nth-last-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) { - list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -28108,7 +28108,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28120,7 +28120,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28130,7 +28130,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 01d509da..f4008f5b 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11357,7 +11357,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -11583,7 +11583,7 @@ /* Browser Console */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) { - list-style-image: url("chrome://devtools/skin/images/command-console.svg"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -11593,7 +11593,7 @@ /* Eyedropper */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) { - list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -11603,7 +11603,7 @@ /* Extensions for Devel */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) { - list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; @@ -13633,7 +13633,7 @@ --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -13641,13 +13641,13 @@ } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ #windowPopup > menuitem[command="minimizeWindow"] { diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 0c93d6f4..bb64697b 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -282,7 +282,7 @@ menu.share-tab-url-item { --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -290,13 +290,13 @@ menu.share-tab-url-item { } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 2b0a8594..c334e99e 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -99,7 +99,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, /* Legacy v104 */ #appMenu-zoom-controls::before { @@ -340,7 +340,7 @@ panelMenuBookmarkThisPage[starred] { /* Browser Console */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) { - list-style-image: url("chrome://devtools/skin/images/command-console.svg"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -350,7 +350,7 @@ panelMenuBookmarkThisPage[starred] { /* Eyedropper */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) { - list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -360,7 +360,7 @@ panelMenuBookmarkThisPage[starred] { /* Extensions for Devel */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) { - list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; From b3e7fff7a5f26874ab6929e2a295e6bf3b790bc5 Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:42:40 +0800 Subject: [PATCH 04/10] Add: Icons - Option for 1.25px stroke --- css/leptonChrome.css | 24 ++++++++++++++++++++++++ css/leptonChromeESR.css | 12 ++++++++++++ src/icons/_1.25px_stroke.scss | 9 +++++++++ src/icons/_index.scss | 5 +++++ user.js | 1 + 5 files changed, 51 insertions(+) create mode 100644 src/icons/_1.25px_stroke.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 58153ac2..1cc1cd70 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13143,6 +13143,18 @@ } } } + /** Icons - 1.25px Stroke Width ***********************************************/ + @supports -moz-bool-pref("userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } + } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { @@ -24855,6 +24867,7 @@ /** Library - Icons Replace ***************************************************/ /** Panel - Icons *************************************************************/ /** Menu - Icons Layout *******************************************************/ + /** Icons - 1.25px Stroke Width ***********************************************/ /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ /*= Tor Browser ==============================================================*/ @@ -28278,6 +28291,17 @@ --menuitem-image: url("chrome://browser/skin/import.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-restart-button { list-style-image: url("../icons/refresh-cw.svg") !important; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f4008f5b..fd2a8389 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13752,6 +13752,18 @@ } } } + /** Icons - 1.25px Stroke Width ***********************************************/ + @supports -moz-bool-pref("userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } + } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss new file mode 100644 index 00000000..0e0a03ce --- /dev/null +++ b/src/icons/_1.25px_stroke.scss @@ -0,0 +1,9 @@ +#firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; +} +#reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; +} +#translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; +} \ No newline at end of file diff --git a/src/icons/_index.scss b/src/icons/_index.scss index cdbf0237..60dce9ed 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -70,5 +70,10 @@ } } +/** Icons - 1.25px Stroke Width ***********************************************/ +@include Option("userChrome.icon.1-25px_stroke") { + @import "1.25px_stroke"; +} + /** Icons for fork browsers ***************************************************/ @import "fork_browsers/index"; diff --git a/user.js b/user.js index 39086e26..ce9873cd 100644 --- a/user.js +++ b/user.js @@ -258,6 +258,7 @@ user_pref("userChrome.icon.menu", true); user_pref("userChrome.icon.context_menu", true); user_pref("userChrome.icon.global_menu", true); user_pref("userChrome.icon.global_menubar", true); +user_pref("userChrome.icon.1-25px_stroke", true); // -- User Content ------------------------------------------------------------- user_pref("userContent.player.ui", true); From 1611ed64730beb3277a91507372982eea64faeaa Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 6 Jan 2024 15:55:15 +0900 Subject: [PATCH 05/10] Fix: Infobar - Align to center #858 --- css/leptonChrome.css | 10 ++++++++++ css/leptonChromeESR.css | 4 ++++ src/compatibility/_theme.scss | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 1cc1cd70..2d704516 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -161,6 +161,10 @@ #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + /*= Infobar Align #858 =======================================================*/ + .container.infobar { + align-items: center !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -13352,6 +13356,7 @@ /*= Drop Indicator Color #473 ================================================*/ /*= Firefox View Border #498 =================================================*/ /*= Menubar rounding #814 ====================================================*/ + /*= Infobar Align #858 =======================================================*/ } @media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.connect_to_window") { /* TARGET: original, photon */ @@ -13456,6 +13461,11 @@ --panel-border-radius: var(--arrowpanel-border-radius); } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + .container.infobar { + align-items: center !important; + } +} /*= OS - Compatibility =======================================================*/ @media (-moz-bool-pref: "userChrome.compatibility.os") { /*= Windows 10 - Top border of accent color at ESR #358 ======================*/ diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index fd2a8389..c65ce1af 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -161,6 +161,10 @@ #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + /*= Infobar Align #858 =======================================================*/ + .container.infobar { + align-items: center !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 041ac7ed..3911d6e1 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -160,3 +160,8 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + +/*= Infobar Align #858 =======================================================*/ +.container.infobar { + align-items: center !important; +} From 6f4f8d6e091643870ff6e1918a9fd065752da2aa Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 6 Jan 2024 16:20:28 +0900 Subject: [PATCH 06/10] Fix: Icons - `Add Dictionaries` #855 --- css/leptonChrome.css | 46 ++++++++++++++--------- css/leptonChromeESR.css | 28 ++++++++------ src/icons/context_menu/_content_area.scss | 3 +- src/icons/layout/_menu_common.scss | 5 ++- 4 files changed, 50 insertions(+), 32 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2d704516..c342f288 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11421,9 +11421,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11505,9 +11506,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11598,9 +11600,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11666,9 +11669,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12115,7 +12119,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { @@ -25997,9 +26002,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26100,9 +26106,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26192,9 +26199,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26255,9 +26263,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26780,7 +26789,8 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index c65ce1af..b46f2b08 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11838,9 +11838,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11922,9 +11923,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12018,9 +12020,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12093,9 +12096,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12276,9 +12280,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12724,7 +12729,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index e10c0a62..165e4375 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -15,7 +15,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } -#spell-add-to-dictionary { +#spell-add-to-dictionary, +#spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index d4306094..3885026f 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -6,6 +6,7 @@ $_iconNoneCommon: ".in-menulist, [checked=\"true\"]"; $_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneCommon})"; $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})"; +$_checkMenu: ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])"; // Components $_nestedPopup: "> menupopup:not(.in-menulist) >"; @@ -30,14 +31,14 @@ $_globalMenus: "#main-menubar > menu"; $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > #{$_iconMenuitem}"; $_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}"; $_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup"; -$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup) > menuitem"; +$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup, #spell-dictionaries-menu) > menuitem#{$_checkMenu}"; $_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, #sidebarMenu-popup:is(menupopup)"; //-- Mixin --------------------------------------------------------------------- // Init Menu $_initialMenus: selector.append( "menupopup menuitem, menupopup menu", - ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])" + $_checkMenu ); $_initialMenus: $_initialMenus + "," + selector.nest($_initialMenus, "> .menu-iconic-left > .menu-iconic-icon"); From 7f354b17c245f2cf382f6e399f8b3a2ce0ba44b0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 7 Jan 2024 20:27:41 +0900 Subject: [PATCH 07/10] Fix: Icons - Mac addon overflow menu #847 --- css/leptonChrome.css | 56 +++++++++++++++++++++++++++++++++++++ css/leptonChromeESR.css | 26 +++++++++++++++++ src/icons/layout/_menu.scss | 25 +++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c342f288..ecee222e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11766,6 +11766,32 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + /* Exeptions */ + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } } /*= Bookmark Menu - Layout ===================================================*/ /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu @@ -26323,6 +26349,7 @@ padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } /* Global Menu */ + /* Exeptions */ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.icon.global_menu.mac") { menupopup:is( @@ -26354,6 +26381,35 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { menupopup menupopup[emptyplacesresult] .menu-text, #PersonalToolbar menupopup[emptyplacesresult] .menu-text { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index b46f2b08..3e8f1584 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12361,6 +12361,32 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + /* Exeptions */ + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } } /*= Bookmark Menu - Layout ===================================================*/ /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index b94e82f5..6b2411fe 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -146,4 +146,29 @@ $_layoutCommonMenus: ( list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + + /* Exeptions */ + // Mac unified extenstions #847 + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem { + &:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + + &:not(.menuitem-iconic):has(.menu-iconic-left) { + &[checked] { + padding-left: 4px !important; + background-image: none !important; + } + &[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + .menu-iconic-text { + padding-left: 8px !important; + } + } + } + } } From 350f20e5e9876e4512965d43c72efe84a88d9a6e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 7 Jan 2024 22:01:11 +0900 Subject: [PATCH 08/10] Fix: Theme - Mac background field color #851 https://github.com/mozilla/gecko-dev/commit/ff5ed156f0e56afbcadc6f2e16fe5254d7df76d5 https://github.com/mozilla/gecko-dev/commit/b21a492ac7c3630407d8e36b8370c77550b4c56a --- css/leptonChrome.css | 4 ++-- src/theme/system_default_theme/_mac.scss | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index ecee222e..5b02ae84 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -780,7 +780,7 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + --mac-sidebar-bgcolor: Window; --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; @@ -14102,7 +14102,7 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + --mac-sidebar-bgcolor: Window; --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss index c94e52c2..b9121930 100644 --- a/src/theme/system_default_theme/_mac.scss +++ b/src/theme/system_default_theme/_mac.scss @@ -8,7 +8,12 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + @if mode.isSTANDARD() { + --mac-sidebar-bgcolor: Window; // TODO: -moz-sidebar; + } + @if mode.isESR() { + --mac-sidebar-bgcolor: -moz-mac-source-list; + } --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; From f19eb3000da841b8e4f0686eebd450e5bab75d78 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 7 Jan 2024 23:46:31 +0900 Subject: [PATCH 09/10] Fix: Tab - Contextline color #857 --- css/leptonChrome.css | 12 ++++++++++++ css/leptonChromeESR.css | 6 ++++++ src/tab/selected_tab/_photon_like_contextline.scss | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5b02ae84..1b2b21c0 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7223,6 +7223,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) @@ -21243,6 +21249,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 3e8f1584..590cbe25 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7632,6 +7632,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index 0b5d4531..9cab5317 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -4,6 +4,10 @@ border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } +#{built-in-light-theme()} .tab-context-line, +#{built-in-dark-theme()} .tab-context-line { + --tab-line-color: rgb(10, 132, 255); +} .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) From 4545b12bbcedca327b4692c8e73685c33669237f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 24 Jan 2024 08:48:48 +0900 Subject: [PATCH 10/10] Fix: Theme - Urlbar background on linux default theme #864 --- css/leptonChrome.css | 12 ------------ css/leptonChromeESR.css | 5 ----- src/theme/system_default_theme/_gtk.scss | 6 ------ 3 files changed, 23 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 1b2b21c0..42fc5d4d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -763,11 +763,6 @@ --urlbar-popup-url-color: -moz-accent-color; } } - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } } /*= Mac - Default like color =================================================*/ @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { @@ -14085,19 +14080,12 @@ :root:not(:-moz-lwtheme) .urlbarView-url { --urlbar-popup-url-color: AccentColor; } - /* Nightly Compatibility */ } @media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") { :root:not(:-moz-lwtheme) .urlbarView-url { --urlbar-popup-url-color: -moz-accent-color; } } -@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } -} @media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { :root:not(:-moz-lwtheme), :root[lwt-default-theme-in-dark-mode] { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 590cbe25..edee2db6 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -982,11 +982,6 @@ --urlbar-popup-url-color: -moz-accent-color; } } - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } } /*= Mac - Default like color =================================================*/ @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { diff --git a/src/theme/system_default_theme/_gtk.scss b/src/theme/system_default_theme/_gtk.scss index 4a2e4547..fb4ec0f3 100644 --- a/src/theme/system_default_theme/_gtk.scss +++ b/src/theme/system_default_theme/_gtk.scss @@ -5,10 +5,4 @@ --urlbar-popup-url-color: #{$accentColor}; } } - - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } }