From af2014ed95040c96e02c61dde6ca9ec93ad8642e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 May 2024 20:06:35 +0900 Subject: [PATCH 01/35] Add: Icons - Translate, Highlight, Widge up/down --- css/leptonChrome.css | 68 +++++++++++++++++++++++ css/leptonChromeESR.css | 26 +++++++++ icons/toolbarButton-editorHighlight.svg | 4 ++ src/icons/context_menu/_content_area.scss | 7 +++ src/icons/context_menu/_others.scss | 24 ++++++++ 5 files changed, 129 insertions(+) create mode 100644 icons/toolbarButton-editorHighlight.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 90e935b..b7ff89e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12507,6 +12507,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -12523,6 +12526,9 @@ #context-searchselect-private { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } @@ -12973,6 +12979,12 @@ .unified-extensions-context-menu-pin-to-toolbar { --menuitem-image: url("../icons/pin-tab.svg"); } + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -12989,6 +13001,20 @@ .urlbarView-result-menuitem[data-command="help"] { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } + /*= full-page-translations-panel-settings-menupopup ==========================*/ + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } + /*= select-translations-panel-settings-menupopup =============================*/ + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ @@ -26958,6 +26984,8 @@ /*= context_sendTabToDevicePopupMenu =========================================*/ /*= unified-extensions-context-menu ==========================================*/ /*= urlbarView-result-menu ===================================================*/ + /*= full-page-translations-panel-settings-menupopup ==========================*/ + /*= select-translations-panel-settings-menupopup =============================*/ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #context_shareTabURL, @@ -27492,6 +27520,11 @@ --menuitem-image: url("../icons/select-all-on.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); @@ -27518,6 +27551,11 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #frame { --menuitem-image: url("../icons/command-frames.svg"); @@ -28175,6 +28213,16 @@ --menuitem-image: url("../icons/pin-tab.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); @@ -28198,6 +28246,26 @@ --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ #file-menu { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f2fe381..88831a0 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13138,6 +13138,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -13154,6 +13157,9 @@ #context-searchselect-private { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } @@ -13604,6 +13610,12 @@ .unified-extensions-context-menu-pin-to-toolbar { --menuitem-image: url("../icons/pin-tab.svg"); } + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -13620,6 +13632,20 @@ .urlbarView-result-menuitem[data-command="help"] { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } + /*= full-page-translations-panel-settings-menupopup ==========================*/ + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } + /*= select-translations-panel-settings-menupopup =============================*/ + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ diff --git a/icons/toolbarButton-editorHighlight.svg b/icons/toolbarButton-editorHighlight.svg new file mode 100644 index 0000000..0e46ba0 --- /dev/null +++ b/icons/toolbarButton-editorHighlight.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 165e437..7cad874 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -207,6 +207,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } +#context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); +} #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -226,6 +229,10 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } +#context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); +} + #frame { --menuitem-image: url("../icons/command-frames.svg"); } diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 8fe0d53..98f40ae 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -241,6 +241,13 @@ menuitem.searchbar-clear-history { --menuitem-image: url("../icons/pin-tab.svg"); } +.unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); +} +.unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); +} + .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -260,3 +267,20 @@ menuitem.searchbar-clear-history { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } + +/*= full-page-translations-panel-settings-menupopup ==========================*/ +.manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +#full-page-translations-panel-settings-menupopup > + menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); +} + +/*= select-translations-panel-settings-menupopup =============================*/ +#select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +#select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); +} From 42598b088b62632d42c4ccf56b58414a6982f62e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 6 May 2024 19:43:11 +0900 Subject: [PATCH 02/35] Fix: Padding - Prevent jitter at customized mode #846 --- css/leptonChrome.css | 2 ++ css/leptonChromeESR.css | 1 + src/padding/_tabbar_width.scss | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b7ff89e..391ac11 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -4152,6 +4152,7 @@ max-width: var(--tab-max-width) !important; /* Original: 225px */ } /* neighbouring tabs should "pinch" together */ + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { @@ -17843,6 +17844,7 @@ } } @media (-moz-bool-pref: "userChrome.padding.tabbar_width") { + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 88831a0..beeea57 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -4475,6 +4475,7 @@ max-width: var(--tab-max-width) !important; /* Original: 225px */ } /* neighbouring tabs should "pinch" together */ + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss index 5573f2c..fdc5ee1 100644 --- a/src/padding/_tabbar_width.scss +++ b/src/padding/_tabbar_width.scss @@ -95,9 +95,10 @@ } /* neighbouring tabs should "pinch" together */ +:root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { - min-width: 3px; // With Panorama Tab Groups #643 + min-width: 3px; // With Panorama Tab Groups #643 #846 } @include NotOption("userChrome.tab.photon_like_padding") { @include Option("userChrome.tab.lepton_like_padding") { From 2af9b3674d1a8908e4051da3cdab9bdad5e0d4bc Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 16 May 2024 02:37:37 +0900 Subject: [PATCH 03/35] Doc: CREDIT - Donate on Ko-Fi --- CREDITS | 3 +++ README.org | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CREDITS b/CREDITS index 6cae6eb..e414ea5 100644 --- a/CREDITS +++ b/CREDITS @@ -40,6 +40,9 @@ W: https://github.com/Cyberax N: AuRiMaS666 W: https://github.com/AuRiMaS666 +N: Duncanyoyo1 +W: https://ko-fi.com/duncanyoyo1 + N: firefox9067 E: firefox@snowdot.kr W: https://github.com/firefox9067 diff --git a/README.org b/README.org index 9f75949..04bb8fb 100644 --- a/README.org +++ b/README.org @@ -212,7 +212,9 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[https://github.com/firefox9067][@@html:@@]] [[https://github.com/Ygg01][@@html:@@]] -- A donation was received from Safira on [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Ko-Fi]] +- A donation was received on [[https://ko-fi.com/black7375][Ko-Fi]] + - [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Safira]] + - [[https://ko-fi.com/duncanyoyo1][https://ko-fi.com/duncanyoyo1]] - Private sponsors: 4 *Contributors* From 2895809cc5c09711b3abfa5a7a59e3f92242bcda Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 01:18:27 +0900 Subject: [PATCH 04/35] Fix: Theme - Tab preview transparent #890 --- css/leptonChrome.css | 20 ++++++++++++++++++++ css/leptonChromeESR.css | 9 +++++++++ src/compatibility/_theme.scss | 6 ++++++ 3 files changed, 35 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 391ac11..d960653 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -184,6 +184,15 @@ :root[tabsintitlebar] #titlebar:-moz-window-inactive .toolbarbutton-icon { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } + /*= Tabpreviw transparent #890 ===============================================*/ + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -13599,6 +13608,7 @@ /*= Menubar rounding #814 ====================================================*/ /*= Infobar Align #858 =======================================================*/ /*= Inactive transparent #882 ================================================*/ + /*= Tabpreviw transparent #890 ===============================================*/ } @media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.connect_to_window") { /* TARGET: original, photon */ @@ -13730,6 +13740,16 @@ fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } +} /*= 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 beeea57..6c05079 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -184,6 +184,15 @@ :root[tabsintitlebar] #titlebar:-moz-window-inactive .toolbarbutton-icon { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } + /*= Tabpreviw transparent #890 ===============================================*/ + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index bd0d991..2cb8861 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -193,3 +193,9 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } } + +/*= Tabpreviw transparent #890 ===============================================*/ +#tab-preview-panel { + --panel-background: var(--arrowpanel-background) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var(--arrowpanel-color) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ +} From f44ed17eb05005752573916ed64f3add1c73487c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 02:04:17 +0900 Subject: [PATCH 05/35] Fix: Padding - Bookmark & History empty align #888 --- css/leptonChrome.css | 12 ++++++++++++ css/leptonChromeESR.css | 5 +++++ src/icons/layout/_panel.scss | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index d960653..4c95fca 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10974,6 +10974,11 @@ > .toolbarbutton-text { padding-inline-start: 0 !important; } + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + } #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { padding-inline-start: var(--arrowpanel-menublank-padding) !important; @@ -25599,6 +25604,13 @@ padding-inline-start: 0 !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 6c05079..2c5a609 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11412,6 +11412,11 @@ > .toolbarbutton-text { padding-inline-start: 0 !important; } + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + } #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { padding-inline-start: var(--arrowpanel-menublank-padding) !important; diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index a117e10..ec95758 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -33,6 +33,11 @@ .toolbaritem-combined-buttons:not(.unified-extensions-item) > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text { padding-inline-start: 0 !important; } +#panelMenu_bookmarksMenu .subviewbutton[disabled="true"], +#appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + padding-inline-start: 0 !important; +} #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { padding-inline-start: var(--arrowpanel-menublank-padding) !important; From 05cb47107511bc98cc814c1f391275aa8298dad9 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 03:34:10 +0900 Subject: [PATCH 06/35] Fix: Tabbar - Border top line at connected window #889 --- css/leptonChrome.css | 12 ++++++++++++ css/leptonChromeESR.css | 5 +++++ src/tab/_connect_to_window.scss | 6 ++++++ 3 files changed, 23 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 4c95fca..2e613dd 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6820,6 +6820,11 @@ /* Temporary solution for compatibility #513 */ overflow-y: clip; } + /* Border top #889 */ + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @@ -20939,6 +20944,7 @@ z-index: 1 !important; } /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ + /* Border top #889 */ } @media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (not (-moz-bool-pref: "userChrome.tabbar.multi_row")) { #TabsToolbar:not([multibar]) { @@ -20954,6 +20960,12 @@ overflow-y: clip; } } +@media (-moz-bool-pref: "userChrome.tab.connect_to_window") { + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } +} /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @media not (-moz-bool-pref: "userChrome.tab.selected_bold") { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 2c5a609..1cf61c6 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7250,6 +7250,11 @@ /* Temporary solution for compatibility #513 */ overflow-y: clip; } + /* Border top #889 */ + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index 641130a..674f9f3 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -34,3 +34,9 @@ overflow-y: clip; } } + +/* Border top #889 */ +#nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; +} From 56bb24131c33189355184c624e41095546332cc8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 04:34:57 +0900 Subject: [PATCH 07/35] Fix: Tab - Tab content margin #892 --- css/leptonChrome.css | 4 ++-- css/leptonChromeESR.css | 2 +- src/tab/_connect_to_window.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2e613dd..56a17f5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6797,7 +6797,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; @@ -20933,7 +20933,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 1cf61c6..d3d1f7d 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7227,7 +7227,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index 674f9f3..76154aa 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -7,7 +7,7 @@ } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; // #892 Consider var(--tab-block-margin) } .tab-stack { From 67f66c419194b4b6ece0e2d31efe54a5f855ec33 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 13:39:32 +0900 Subject: [PATCH 08/35] Doc: Funding - Ko-Fi --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3bbad13..541c511 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -15,3 +15,4 @@ # custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] github: [black7375] +ko_fi: [black7375] From 1406c3fd7bb4b43bade7962491d3106ae58cf10d Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 19 May 2024 19:09:03 +0900 Subject: [PATCH 09/35] Doc: CI - Release info add to user.js #876 --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9faa3c5..bc619ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,8 +64,10 @@ jobs: # or TAGVER=$(git describe --tags --abbrev=0) BRANCH=${{ matrix.branch }} TAGVER=${GITHUB_REF#refs/*/} + NAME=${{ matrix.name }} echo -e "[Info]\nVer=${TAGVER}\nBranch=${BRANCH}" > LEPTON + sed -i "1i// ${TAGVER} ${NAME}" user.js - name: Processing for STANDARD if: matrix.mode == 'STANDARD' From 6ba8a18abe815dd7ae371332f1bb1c908ebda390 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 26 May 2024 22:35:45 +0900 Subject: [PATCH 10/35] Fix: Tabbar - Border Top line at linux default theme #889 --- css/leptonChrome.css | 10 ++++++++++ css/leptonChromeESR.css | 5 +++++ src/tab/_connect_to_window.scss | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 56a17f5..2f797db 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6825,6 +6825,11 @@ border-top: none !important; box-shadow: 0 -0.01px 0 ThreeDShadow; } + @media (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @@ -20966,6 +20971,11 @@ box-shadow: 0 -0.01px 0 ThreeDShadow; } } +@media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } +} /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @media not (-moz-bool-pref: "userChrome.tab.selected_bold") { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index d3d1f7d..dd3245a 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7255,6 +7255,11 @@ border-top: none !important; box-shadow: 0 -0.01px 0 ThreeDShadow; } + @media (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index 76154aa..89ba62b 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -39,4 +39,9 @@ #nav-bar { border-top: none !important; box-shadow: 0 -0.01px 0 ThreeDShadow; + @include OS($linux) { + @include not_lwtheme(false) { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } } From ec18b2f9d3faeefa14debb8c165e074822c472ee Mon Sep 17 00:00:00 2001 From: Artur Pragacz Date: Wed, 29 May 2024 05:50:50 +0200 Subject: [PATCH 11/35] Fix: Tabbar - Container opacity when not pinned --- css/leptonChrome.css | 8 ++++++-- css/leptonChromeESR.css | 5 ++++- src/tab/_container_tab.scss | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2f797db..baca614 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8476,7 +8476,10 @@ } } @supports not -moz-bool-pref("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] + > .tab-stack + > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ @@ -22793,7 +22796,8 @@ } } @media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.on_top")) { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index dd3245a..dff5f81 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -8906,7 +8906,10 @@ } } @supports not -moz-bool-pref("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] + > .tab-stack + > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ diff --git a/src/tab/_container_tab.scss b/src/tab/_container_tab.scss index 5a2fa7c..746f773 100644 --- a/src/tab/_container_tab.scss +++ b/src/tab/_container_tab.scss @@ -71,7 +71,8 @@ } @include NotOption("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } From da0ceaf684eaeb23e3cf9a35d3e5a0a0aab9989f Mon Sep 17 00:00:00 2001 From: Artur Pragacz Date: Thu, 17 Nov 2022 01:28:10 +0100 Subject: [PATCH 12/35] Add: Tabbar - Container always long option --- css/leptonChrome.css | 30 +++++++++++++++++++++--------- css/leptonChromeESR.css | 17 ++++++++++++----- src/tab/_container_tab.scss | 18 +++++++++++++----- user.js | 1 + 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index baca614..b980956 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8448,15 +8448,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + @supports not -moz-bool-pref("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { @@ -22763,17 +22770,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } } @media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) { - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } } -@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) { +@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.always_long")) { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { width: calc(100% - 33px); } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index dff5f81..38b25a4 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -8878,15 +8878,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + @supports not -moz-bool-pref("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { diff --git a/src/tab/_container_tab.scss b/src/tab/_container_tab.scss index 746f773..311680b 100644 --- a/src/tab/_container_tab.scss +++ b/src/tab/_container_tab.scss @@ -39,15 +39,23 @@ /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } -.tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); +.tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + +@include NotOption("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ diff --git a/user.js b/user.js index fb61dcf..06aa26f 100644 --- a/user.js +++ b/user.js @@ -177,6 +177,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.tab.close_button_at_hover.with_selected", true); // Need close_button_at_hover // user_pref("userChrome.tab.sound_show_label", true); // Need remove sound_hide_label // user_pref("userChrome.tab.container.on_top", true); +// user_pref("userChrome.tab.container.always_long", true); // user_pref("userChrome.tab.sound_with_favicons.on_center", true); // user_pref("userChrome.tab.selected_bold", true); From 4da9a0fe7e795945b4a8e1f230374feef898a556 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 8 Jun 2024 13:55:41 +0900 Subject: [PATCH 13/35] Fix: Icon - Addon permmision banner --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 3 +++ src/icons/_panel.scss | 3 +++ 3 files changed, 14 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b980956..27cac14 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11068,6 +11068,9 @@ order: -1 !important; -moz-box-ordinal-group: 0 !important; } + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); } @@ -25742,6 +25745,11 @@ -moz-box-ordinal-group: 0 !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 38b25a4..69b41de 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11506,6 +11506,9 @@ order: -1 !important; -moz-box-ordinal-group: 0 !important; } + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); } diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index c334e99..a31516c 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -4,6 +4,9 @@ margin-inline-start: var(--arrowpanel-menuicon-padding); @include BoxOrder(0, true); } +#appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; +} #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); From 1946f9e2b100926c30b9103226cc0c0e853375f8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 15 Jun 2024 03:06:20 +0900 Subject: [PATCH 14/35] Fix: User Contents - Darkmode text, icon colors #904 --- css/leptonContent.css | 12 ++++++++++-- css/leptonContentESR.css | 6 +++++- src/contents/dark_mode/_addons_org.scss | 1 + src/contents/dark_mode/_support_org.scss | 6 +++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 37a2458..484da4f 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -1007,6 +1007,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -1498,6 +1499,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -1606,7 +1608,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { @@ -4643,6 +4647,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -5134,6 +5139,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -5242,7 +5248,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 1a6cebc..f7264ba 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -1009,6 +1009,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -1500,6 +1501,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -1608,7 +1610,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { diff --git a/src/contents/dark_mode/_addons_org.scss b/src/contents/dark_mode/_addons_org.scss index 01ff0c9..71239a2 100644 --- a/src/contents/dark_mode/_addons_org.scss +++ b/src/contents/dark_mode/_addons_org.scss @@ -77,6 +77,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, diff --git a/src/contents/dark_mode/_support_org.scss b/src/contents/dark_mode/_support_org.scss index b0deeaa..f4fcb4b 100644 --- a/src/contents/dark_mode/_support_org.scss +++ b/src/contents/dark_mode/_support_org.scss @@ -25,6 +25,8 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -141,7 +143,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before, { filter: invert(95%) !important; } button.markup-toolbar-button { From e630745c4a084951e282058a8e8f322fa26f443b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 16 Jun 2024 03:33:01 +0900 Subject: [PATCH 15/35] Fix: UserContent - Remove experimental category description #912 --- css/leptonContent.css | 6 ++++++ css/leptonContentESR.css | 3 +++ src/contents/_compatibility.scss | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 484da4f..ac3efc2 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -21,6 +21,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; @@ -3646,6 +3649,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index f7264ba..b36bcb1 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -21,6 +21,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index d9863f1..dbff598 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -23,6 +23,10 @@ > hbox { transform: translateY(5px); } + + .description-deemphasized { + display: none; // #912 + } } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); From 036918bed9907da56fb3b5d55e9b5dd18101dc6c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 19 Jun 2024 00:27:05 +0900 Subject: [PATCH 16/35] Fix: Icons - about:process link icon #919 --- css/leptonContent.css | 16 ++++++++++++++++ css/leptonContentESR.css | 7 +++++++ src/contents/_proton_contents.scss | 3 +++ .../proton_contents/_about_processes.scss | 5 +++++ 4 files changed, 31 insertions(+) create mode 100644 src/contents/proton_contents/_about_processes.scss diff --git a/css/leptonContent.css b/css/leptonContent.css index ac3efc2..1ef6004 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2222,6 +2222,13 @@ background-color: var(--in-content-box-background-odd); } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { @@ -5712,6 +5719,7 @@ /*= about:checkerboard =======================================================*/ /*= about:memory =============================================================*/ /*= about:preferences ========================================================*/ + /*= about:processes ==========================================================*/ /*= chrome://browser/content/places/places.xhtml =============================*/ } @media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userContent.page.field_border") and (prefers-reduced-motion: no-preference) { @@ -5875,6 +5883,14 @@ } } } +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + } +} @media (-moz-bool-pref: "userContent.page.proton") { @-moz-document url("chrome://browser/content/places/places.xhtml") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index b36bcb1..fd6c048 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2225,6 +2225,13 @@ background-color: var(--in-content-box-background-odd); } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { diff --git a/src/contents/_proton_contents.scss b/src/contents/_proton_contents.scss index cefc4d6..2a06c7a 100644 --- a/src/contents/_proton_contents.scss +++ b/src/contents/_proton_contents.scss @@ -29,5 +29,8 @@ /*= about:preferences ========================================================*/ @import "proton_contents/about_preferences"; +/*= about:processes ==========================================================*/ +@import "proton_contents/about_processes"; + /*= chrome://browser/content/places/places.xhtml =============================*/ @import "../library/contents"; diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss new file mode 100644 index 0000000..0efd596 --- /dev/null +++ b/src/contents/proton_contents/_about_processes.scss @@ -0,0 +1,5 @@ +@include moz-document(url-prefix "about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { + background-image: url("../icons/link.svg") !important; + } +} From 5861dbaaf4e5e6671cb230ef7da0b3ae4e7d49d1 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 19 Jun 2024 01:12:30 +0900 Subject: [PATCH 17/35] Fix: Icons - Performance icon replace #918 --- css/leptonChrome.css | 10 ++++++++++ css/leptonChromeESR.css | 5 +++++ css/leptonContent.css | 18 ++++++++++++++++++ css/leptonContentESR.css | 8 ++++++++ .../proton_contents/_about_processes.scss | 11 +++++++++++ src/icons/_1.25px_stroke.scss | 15 +++++++++++---- 6 files changed, 63 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 27cac14..92a7af8 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13436,6 +13436,11 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @@ -28886,6 +28891,11 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-restart-button { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 69b41de..133c30f 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -14067,6 +14067,11 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ diff --git a/css/leptonContent.css b/css/leptonContent.css index 1ef6004..2eb7f10 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2228,6 +2228,14 @@ { background-image: url("../icons/link.svg") !important; } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") @@ -5889,6 +5897,16 @@ { background-image: url("../icons/link.svg") !important; } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } +} +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } } } @media (-moz-bool-pref: "userContent.page.proton") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index fd6c048..afe6486 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2231,6 +2231,14 @@ { background-image: url("../icons/link.svg") !important; } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index 0efd596..7d52b32 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -2,4 +2,15 @@ td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { background-image: url("../icons/link.svg") !important; } + + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } } + +@include moz-document(url-prefix "about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } +} + diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss index 0e0a03c..21cf349 100644 --- a/src/icons/_1.25px_stroke.scss +++ b/src/icons/_1.25px_stroke.scss @@ -1,9 +1,16 @@ #firefox-view-button { - list-style-image: url("../icons/firefox-view.svg") !important; + list-style-image: url("../icons/firefox-view.svg") !important; } #reset-pbm-toolbar-button { - list-style-image: url("../icons/flame.svg") !important; + 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 + list-style-image: url("../icons/translations.svg") !important; +} + +.tabbrowser-tab:is( + [image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"] +) .tab-icon-image { + content: url("../icons/performance.svg") !important; +} From 39705f18a53f3f2d636c9791f41d402cd44a9563 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 03:46:10 +0000 Subject: [PATCH 18/35] Build(deps): Bump braces from 3.0.2 to 3.0.3 Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index da567ca..b4142e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -902,11 +902,11 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" browserslist@^4.21.3: version "4.21.4" @@ -1232,10 +1232,10 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" From c08cef22c4ebefa00221edbd2267ec1f674d01ff Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 20 Jun 2024 16:28:14 +0900 Subject: [PATCH 19/35] Fix: Icons - Firefox view icon for menubar #915 --- css/leptonChrome.css | 4 ++-- css/leptonChromeESR.css | 2 +- src/icons/_global_menu.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 92a7af8..01ad506 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13279,7 +13279,7 @@ --menuitem-image: url("chrome://browser/skin/sync.svg"); } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, #browserToolsMenu { @@ -28669,7 +28669,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_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.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 133c30f..a65986a 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13910,7 +13910,7 @@ --menuitem-image: url("chrome://browser/skin/sync.svg"); } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, #browserToolsMenu { diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index bb64697..6997d8d 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -252,7 +252,7 @@ menu.share-tab-url-item { } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, /* Legacy */ #browserToolsMenu { From 4704dd9a98ccedd6fca272a573039f2659fb5af1 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 21 Jun 2024 16:35:08 +0900 Subject: [PATCH 20/35] Fix: Icons - `about:debugging` #921 --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 4 ++++ src/icons/_1.25px_stroke.scss | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 01ad506..3534384 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13441,6 +13441,10 @@ { content: url("../icons/performance.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @@ -28896,6 +28900,10 @@ { content: url("../icons/performance.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-restart-button { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index a65986a..2c99e40 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -14072,6 +14072,10 @@ { content: url("../icons/performance.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss index 21cf349..ac47244 100644 --- a/src/icons/_1.25px_stroke.scss +++ b/src/icons/_1.25px_stroke.scss @@ -14,3 +14,9 @@ ) .tab-icon-image { content: url("../icons/performance.svg") !important; } + +.tabbrowser-tab:is( + [image="chrome://global/skin/icons/developer.svg"] +) .tab-icon-image { + content: url("../icons/developer.svg") !important; +} From d7286e7504eed41f288d932f4351be69c8a92fc5 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 22 Jun 2024 16:43:11 +0900 Subject: [PATCH 21/35] Fix: Icons - Update banner icon --- css/leptonChrome.css | 4 ++++ css/leptonChromeESR.css | 2 ++ src/icons/_panel.scss | 2 ++ 3 files changed, 8 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3534384..89d3a45 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11071,8 +11071,10 @@ #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { display: inline-flex !important; } + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ @@ -25760,8 +25762,10 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 2c99e40..6c36e31 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11509,8 +11509,10 @@ #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { display: inline-flex !important; } + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index a31516c..f793df4 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -8,8 +8,10 @@ display: inline-flex !important; } +#appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ From a811e430b895e3db02c0dfd628dcc6d97f4fd6ed Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 23 Jun 2024 16:56:43 +0900 Subject: [PATCH 22/35] Fix: Panel - Remove duplicate seperator --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 3 +++ src/icons/_panel.scss | 3 +++ 3 files changed, 14 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 89d3a45..a9da63d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11301,6 +11301,9 @@ margin: var(--panel-separator-margin); padding: 0; } + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } #PanelUI-fxa-menu > :first-child { order: -1; -moz-box-ordinal-group: 0; @@ -26057,6 +26060,11 @@ padding: 0; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #PanelUI-fxa-menu > :first-child { order: -1; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 6c36e31..5d97e4e 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11739,6 +11739,9 @@ margin: var(--panel-separator-margin); padding: 0; } + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } #PanelUI-fxa-menu > :first-child { order: -1; -moz-box-ordinal-group: 0; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index f793df4..d94cb02 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -249,6 +249,9 @@ margin: var(--panel-separator-margin); padding: 0; } +#PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; // #916 +} #PanelUI-fxa-menu > :first-child { @include BoxOrder(0); } From e8e19443805dc3c433f137372ae9a5b9a23b8948 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 24 Jun 2024 17:19:49 +0900 Subject: [PATCH 23/35] Fix: Content - Darkmode for accounts.com --- css/leptonContent.css | 26 +++++++++++++++++++++++ css/leptonContentESR.css | 13 ++++++++++++ src/contents/dark_mode/_accounts_com.scss | 12 +++++++++++ 3 files changed, 51 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 2eb7f10..0a0a732 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -1678,6 +1678,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -1722,6 +1723,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -1734,6 +1736,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -1761,6 +1764,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -1771,6 +1782,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -1779,6 +1791,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, @@ -5336,6 +5349,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -5380,6 +5394,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -5392,6 +5407,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -5419,6 +5435,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -5429,6 +5453,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -5437,6 +5462,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index afe6486..b129b07 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -1681,6 +1681,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -1725,6 +1726,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -1737,6 +1739,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -1764,6 +1767,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -1774,6 +1785,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -1782,6 +1794,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, diff --git a/src/contents/dark_mode/_accounts_com.scss b/src/contents/dark_mode/_accounts_com.scss index 9ae0afc..654ffb3 100644 --- a/src/contents/dark_mode/_accounts_com.scss +++ b/src/contents/dark_mode/_accounts_com.scss @@ -25,6 +25,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -71,6 +72,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -83,6 +85,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -111,6 +114,13 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -122,6 +132,7 @@ } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -130,6 +141,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, From 76e3d6c49d571588f2b522996520f162185cd5eb Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 25 Jun 2024 17:26:13 +0900 Subject: [PATCH 24/35] Doc: CREDITS - Sponsors update --- CREDITS | 3 +++ README.org | 1 + 2 files changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index e414ea5..24c1a9c 100644 --- a/CREDITS +++ b/CREDITS @@ -55,6 +55,9 @@ N: Jiho Lee E: optional.int@kakao.com W: https://github.com/DPS0340 +N: Julie Engel +W: https://github.com/engelju + N: kanlukasz W: https://github.com/kanlukasz diff --git a/README.org b/README.org index 04bb8fb..b707874 100644 --- a/README.org +++ b/README.org @@ -211,6 +211,7 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[https://github.com/AuRiMaS666][@@html:@@]] [[https://github.com/firefox9067][@@html:@@]] [[https://github.com/Ygg01][@@html:@@]] +[[https://github.com/engelju][@@html:@@]] - A donation was received on [[https://ko-fi.com/black7375][Ko-Fi]] - [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Safira]] From 73b68dad86bd86b29c9199d01d065c89eda212d5 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 25 Jun 2024 17:50:32 +0900 Subject: [PATCH 25/35] Fix: Panel - Seperator show at sign in #916 --- css/leptonChrome.css | 4 ++-- css/leptonChromeESR.css | 2 +- src/icons/_panel.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index a9da63d..e7a1a10 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11301,7 +11301,7 @@ margin: var(--panel-separator-margin); padding: 0; } - #PanelUI-fxa-cta-menu #PanelUI-products-separator { + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { display: none; } #PanelUI-fxa-menu > :first-child { @@ -26061,7 +26061,7 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { - #PanelUI-fxa-cta-menu #PanelUI-products-separator { + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { display: none; } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 5d97e4e..b5cf4a7 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11739,7 +11739,7 @@ margin: var(--panel-separator-margin); padding: 0; } - #PanelUI-fxa-cta-menu #PanelUI-products-separator { + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { display: none; } #PanelUI-fxa-menu > :first-child { diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index d94cb02..a2b425a 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -249,7 +249,7 @@ margin: var(--panel-separator-margin); padding: 0; } -#PanelUI-fxa-cta-menu #PanelUI-products-separator { +#PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { display: none; // #916 } #PanelUI-fxa-menu > :first-child { From 0aaa6d2c02995222afdc0fb48785d055d31a92d4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 26 Jun 2024 17:59:56 +0900 Subject: [PATCH 26/35] Fix: Icons - Hourglass icon for reduce animation at sync #909 --- css/leptonChrome.css | 14 ++++++++++++++ css/leptonChromeESR.css | 7 +++++++ src/icons/_panel.scss | 7 +++++++ 3 files changed, 28 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e7a1a10..46d9273 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11259,6 +11259,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } + @media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } + } #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); } @@ -26005,6 +26012,13 @@ list-style-image: url("chrome://browser/skin/sync.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index b5cf4a7..2b47b3c 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11697,6 +11697,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } + @media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } + } #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); } diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index a2b425a..2836b3d 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -205,6 +205,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } +@media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } +} #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); From 58ff8dcfb1fb2edcf89bcc10691afa885731cdf0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Jun 2024 18:23:16 +0900 Subject: [PATCH 27/35] Fix: Content - Same size sidebar button at `about:addons` #911 --- css/leptonContent.css | 6 ++++++ css/leptonContentESR.css | 3 +++ src/contents/_compatibility.scss | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 0a0a732..94dcb0b 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -34,6 +34,9 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } } /** Video player **************************************************************/ /* Control Bar Size */ @@ -3690,6 +3693,9 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } } /** Video player **************************************************************/ /* Control Bar Size */ diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index b129b07..a11e844 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -34,6 +34,9 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } } /** Video player **************************************************************/ /* Control Bar Size */ diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index dbff598..50de179 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -34,10 +34,15 @@ } } -// #695 @include moz-document(url-prefix "about:addons") { + // #695 #updates-message + .page-options-menu > .more-options-button { box-sizing: content-box; padding: 0 !important; } + + // #911 + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } } From 7d8225efc8ad9a44135a1cb771d247dfb435c0a9 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 28 Jun 2024 19:03:49 +0900 Subject: [PATCH 28/35] Fix: Content - Reduce translate table height #910 --- css/leptonContent.css | 16 ++++++++++++++++ css/leptonContentESR.css | 8 ++++++++ src/contents/_compatibility.scss | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 94dcb0b..72ea6ee 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -12,6 +12,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } @@ -3671,6 +3679,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index a11e844..b4ee702 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -12,6 +12,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index 50de179..121880c 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -11,6 +11,16 @@ padding-inline-start: 35px !important; } + // #910 + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } + // Align & Separator #722 #firefoxExperimentalCategory { &:not([hidden="true"]) { From 038265576d90533ed54fbd166d128013c40cd2ac Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 29 Jun 2024 19:07:48 +0900 Subject: [PATCH 29/35] Fix: Content - Same size sidebar button at `about:policies` #923 --- css/leptonContent.css | 10 ++++++++++ css/leptonContentESR.css | 5 +++++ src/contents/_compatibility.scss | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 72ea6ee..7e5a57a 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -46,6 +46,11 @@ padding-inline-end: 1px !important; /* Original: 4px */ } } +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } +} /** Video player **************************************************************/ /* Control Bar Size */ @supports -moz-bool-pref("userContent.player.size") { @@ -3713,6 +3718,11 @@ padding-inline-end: 1px !important; /* Original: 4px */ } } +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } +} /** Video player **************************************************************/ /* Control Bar Size */ @media (-moz-bool-pref: "userContent.player.size") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index b4ee702..40ab7f0 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -46,6 +46,11 @@ padding-inline-end: 1px !important; /* Original: 4px */ } } +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } +} /** Video player **************************************************************/ /* Control Bar Size */ @supports -moz-bool-pref("userContent.player.size") { diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index 121880c..3a205d2 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -56,3 +56,10 @@ padding-inline-end: 1px !important; /* Original: 4px */ } } + +@include moz-document(url-prefix "about:policies") { + // #923 + #categories > .category { + box-sizing: border-box; + } +} From d8a4ad6765d1a1a3b7b0bca381284514c7ecc0c8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 1 Jul 2024 12:23:58 +0900 Subject: [PATCH 30/35] Fix: Install - Cachy Browser --- install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sh b/install.sh index ab6c377..5ba9579 100755 --- a/install.sh +++ b/install.sh @@ -341,6 +341,7 @@ firefoxProfileDirPaths=( "${HOME}/.ghostery browser" "${HOME}/.pulse-browser" "${HOME}/.firedragon" + "${HOME}/.cachy" "${HOME}/.local/opt/tor-browser/app/Browser/TorBrowser/Data/Browser" "${HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox" "${HOME}/snap/firefox/common/.mozilla/firefox" From 260557f2571267a42ced87fed84c129a0aef4fff Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 1 Jul 2024 13:10:11 +0900 Subject: [PATCH 31/35] Fix: Theme - Mac system theme toolbar color #897 --- css/leptonChrome.css | 4 ++-- css/leptonChromeESR.css | 2 +- src/theme/system_default_theme/_mac.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 46d9273..c12f77c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -822,7 +822,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: Window; @@ -14418,7 +14418,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: Window; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 2b47b3c..743c78c 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -1044,7 +1044,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: -moz-mac-source-list; diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss index 5ea7ef4..f48da86 100644 --- a/src/theme/system_default_theme/_mac.scss +++ b/src/theme/system_default_theme/_mac.scss @@ -5,7 +5,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; @if mode.isSTANDARD() { From df476af576b1ac000625423c6c06dd67fb4255fd Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:28:22 +0800 Subject: [PATCH 32/35] Add close duplicate tabs icons (cherry picked from commit da76b3febf8f054ce9990fc2ca695f679de89e5a) --- icons/close-duplicate-tabs-photon.svg | 1 + icons/close-duplicate-tabs.svg | 1 + 2 files changed, 2 insertions(+) create mode 100644 icons/close-duplicate-tabs-photon.svg create mode 100644 icons/close-duplicate-tabs.svg diff --git a/icons/close-duplicate-tabs-photon.svg b/icons/close-duplicate-tabs-photon.svg new file mode 100644 index 0000000..f77036b --- /dev/null +++ b/icons/close-duplicate-tabs-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-duplicate-tabs.svg b/icons/close-duplicate-tabs.svg new file mode 100644 index 0000000..a24c971 --- /dev/null +++ b/icons/close-duplicate-tabs.svg @@ -0,0 +1 @@ + \ No newline at end of file From 0504d7481b711f193bc67e52b0db7d571dac5205 Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:19:17 +0800 Subject: [PATCH 33/35] Icons for https://github.com/black7375/Firefox-UI-Fix/issues/917 * Close Tab (proton & photon style) * Close Window * Find Again (not quite sure about this one) (cherry picked from commit ddabb21cce8e93fd4a79312b37044e0a9f87dfde) --- icons/close-tab-photon.svg | 1 + icons/close-tab.svg | 1 + icons/close-window.svg | 1 + icons/find-again.svg | 1 + 4 files changed, 4 insertions(+) create mode 100644 icons/close-tab-photon.svg create mode 100644 icons/close-tab.svg create mode 100644 icons/close-window.svg create mode 100644 icons/find-again.svg diff --git a/icons/close-tab-photon.svg b/icons/close-tab-photon.svg new file mode 100644 index 0000000..31b724b --- /dev/null +++ b/icons/close-tab-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-tab.svg b/icons/close-tab.svg new file mode 100644 index 0000000..20ce397 --- /dev/null +++ b/icons/close-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-window.svg b/icons/close-window.svg new file mode 100644 index 0000000..3c92d8c --- /dev/null +++ b/icons/close-window.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/find-again.svg b/icons/find-again.svg new file mode 100644 index 0000000..8f1b2b7 --- /dev/null +++ b/icons/find-again.svg @@ -0,0 +1 @@ + \ No newline at end of file From f5e3ce143c51d6cf453e3fcd6445879456de8f24 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 1 Jul 2024 15:46:18 +0900 Subject: [PATCH 34/35] Add: Icons - Duplicate close tabs #903 --- css/leptonChrome.css | 22 ++++++++++++++++++++++ css/leptonChromeESR.css | 10 ++++++++++ src/icons/_index.scss | 2 ++ src/icons/_panel.scss | 3 +++ src/icons/context_menu/_tab_toolbar.scss | 5 +++++ 5 files changed, 42 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c12f77c..541c092 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10748,6 +10748,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -10766,6 +10767,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -11480,6 +11482,9 @@ #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } @@ -12222,6 +12227,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } + } @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, @@ -25371,6 +25381,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -25398,6 +25409,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -26320,6 +26332,11 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); @@ -27134,6 +27151,11 @@ --menuitem-image: url("chrome://global/skin/icons/close.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 743c78c..394537d 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11186,6 +11186,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -11204,6 +11205,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -11918,6 +11920,9 @@ #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } @@ -12850,6 +12855,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } + } @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, diff --git a/src/icons/_index.scss b/src/icons/_index.scss index 60dce9e..bbf079a 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -7,6 +7,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -16,6 +17,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 2836b3d..e276e4b 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -439,6 +439,9 @@ panelMenuBookmarkThisPage[starred] { #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } +#allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); +} #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index a5ce5e3..2488d3b 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -121,6 +121,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } +#context_closeDuplicateTabs { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } +} #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs, From 362f34bece31a0e89b87d036547a56fc2c412d0c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 1 Jul 2024 16:02:04 +0900 Subject: [PATCH 35/35] Add: Icons - Close Tab, Close Window, Find Again #917 --- css/leptonChrome.css | 102 ++++++++++++++++++++++++++---------- css/leptonChromeESR.css | 15 ++++++ src/icons/_global_menu.scss | 7 +++ src/icons/_index.scss | 2 + 4 files changed, 99 insertions(+), 27 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 541c092..dac3290 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10748,6 +10748,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); @@ -10767,6 +10768,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); @@ -13121,6 +13123,14 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } + } #menu_savePage { --menuitem-image: url("../icons/toolbarButton-download.svg"); } @@ -13174,6 +13184,11 @@ #menu_find { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } + } #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -25381,6 +25396,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); @@ -25409,6 +25425,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); @@ -28448,36 +28465,11 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } - #menu_savePage { - --menuitem-image: url("../icons/toolbarButton-download.svg"); - } - #menu_sendLink { - --menuitem-image: url("../icons/mail.svg"); - } - menu.share-tab-url-item { - --menuitem-image: url("chrome://browser/skin/share.svg"); - } - #menu_print { - --menuitem-image: url("chrome://global/skin/icons/print.svg"); - } - #menu_importFromAnotherBrowser { - --menuitem-image: url("chrome://browser/skin/import.svg"); - } - #goOfflineMenuitem { - /* checkbox */ - --menuitem-image: url("../icons/plug-disconnected.svg"); - } - #menu_FileQuitItem { - --menuitem-image: url("../icons/quit.svg"); + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); } /* Mange Containers */ - #menu_newUserContext menupopup menuitem:last-child { - --menuitem-image: url("chrome://global/skin/icons/settings.svg"); - } /*= menu_EditPopup ===========================================================*/ - #menu_undo { - --menuitem-image: url("../icons/undo.svg"); - } /*= menu_viewPopup ===========================================================*/ /* view-menu-popup sub menu */ /* viewSidebarMenu sub menu */ @@ -28490,6 +28482,57 @@ /*= windowPopup ==============================================================*/ /*= menu_HelpPopup ===========================================================*/ } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_savePage { + --menuitem-image: url("../icons/toolbarButton-download.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_sendLink { + --menuitem-image: url("../icons/mail.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + menu.share-tab-url-item { + --menuitem-image: url("chrome://browser/skin/share.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_print { + --menuitem-image: url("chrome://global/skin/icons/print.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_importFromAnotherBrowser { + --menuitem-image: url("chrome://browser/skin/import.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #goOfflineMenuitem { + /* checkbox */ + --menuitem-image: url("../icons/plug-disconnected.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_FileQuitItem { + --menuitem-image: url("../icons/quit.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_newUserContext menupopup menuitem:last-child { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_undo { + --menuitem-image: url("../icons/undo.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #menu_redo { --menuitem-image: url("../icons/redo.svg"); @@ -28525,6 +28568,11 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 394537d..699c3e0 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11186,6 +11186,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); @@ -11205,6 +11206,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); @@ -13752,6 +13754,14 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } + } #menu_savePage { --menuitem-image: url("../icons/toolbarButton-download.svg"); } @@ -13805,6 +13815,11 @@ #menu_find { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } + } #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 6997d8d..fa0de58 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -22,8 +22,12 @@ --menuitem-image: url("../icons/toolbarButton-upload.svg"); } #menu_close { + --menuitem-image: var(--uc-tab-close-icon); } #menu_closeWindow { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/close-window.svg"); + } } #menu_savePage { @@ -90,6 +94,9 @@ menu.share-tab-url-item { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } #menu_findAgain { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/find-again.svg"); + } } #textfieldDirection-swap { diff --git a/src/icons/_index.scss b/src/icons/_index.scss index bbf079a..c9fe7f8 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -7,6 +7,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); @@ -17,6 +18,7 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg");