From 823d878916434c17b40cfc5fd9a0c3b394f7a656 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 19 Aug 2024 14:44:26 +0900 Subject: [PATCH 1/8] Fix: Icons - AI Chatbot on sidebar #957 --- css/leptonChrome.css | 14 ++++++++++++++ css/leptonChromeESR.css | 6 ++++++ src/icons/_panel.scss | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index f5a4862..1127e65 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11580,6 +11580,12 @@ #sidebar-switcher-tabs:is(menuitem) { --menuitem-image: url("../icons/synced-tabs.svg"); } + #sidebar-switcher-genai-chat.subviewbutton { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } + #sidebar-switcher-genai-chat:is(menuitem) { + --menuitem-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } #sidebar-reverse-position.subviewbutton { list-style-image: var(--uc-sidebar-icon-reverse); } @@ -26493,6 +26499,14 @@ --menuitem-image: url("../icons/synced-tabs.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #sidebar-switcher-genai-chat.subviewbutton { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } + #sidebar-switcher-genai-chat:is(menuitem) { + --menuitem-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #sidebar-reverse-position.subviewbutton { list-style-image: var(--uc-sidebar-icon-reverse); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 013dd51..ac8d5d9 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12018,6 +12018,12 @@ #sidebar-switcher-tabs:is(menuitem) { --menuitem-image: url("../icons/synced-tabs.svg"); } + #sidebar-switcher-genai-chat.subviewbutton { + list-style-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } + #sidebar-switcher-genai-chat:is(menuitem) { + --menuitem-image: url("chrome://mozapps/skin/extensions/category-discover.svg"); + } #sidebar-reverse-position.subviewbutton { list-style-image: var(--uc-sidebar-icon-reverse); } diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index e276e4b..9240e7b 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -550,6 +550,10 @@ panelMenuBookmarkThisPage[starred] { @include _subviewMenuitem(url("../icons/synced-tabs.svg")); } +#sidebar-switcher-genai-chat { + @include _subviewMenuitem(url("chrome://mozapps/skin/extensions/category-discover.svg")); +} + #sidebar-reverse-position { @include _subviewMenuitem(var(--uc-sidebar-icon-reverse)); } From fcab63308d060eb893bc90e33d1f994c4a98377f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 23 Aug 2024 15:18:22 +0900 Subject: [PATCH 2/8] Fix: Icons - Duplicate Tabs Icon at treestyletab #958 --- css/leptonChrome.css | 2 ++ css/leptonChromeESR.css | 1 + src/icons/context_menu/_tab_toolbar.scss | 1 + 3 files changed, 4 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 1127e65..b0265b5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12248,6 +12248,7 @@ --menuitem-image: url("chrome://global/skin/icons/close.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { + #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs, #context_closeDuplicateTabs { --menuitem-image: var(--uc-tab-close-duplicate-icon); } @@ -27210,6 +27211,7 @@ } } @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") { + #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs, #context_closeDuplicateTabs { --menuitem-image: var(--uc-tab-close-duplicate-icon); } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index ac8d5d9..53e64e4 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12876,6 +12876,7 @@ --menuitem-image: url("chrome://global/skin/icons/close.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { + #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs, #context_closeDuplicateTabs { --menuitem-image: var(--uc-tab-close-duplicate-icon); } diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index b95f525..c8204ea 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -133,6 +133,7 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } +#treestyletab_piro_sakura_ne_jp-menuitem-_context_closeDuplicatedTabs, #context_closeDuplicateTabs { @include Option("userChrome.icon.menu.full") { --menuitem-image: var(--uc-tab-close-duplicate-icon); From 2a2c20220e4b2d50b2ae16f579076143411d2311 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 24 Aug 2024 15:30:13 +0900 Subject: [PATCH 3/8] Fix: UserContent - `View Available Updates` height #685 --- css/leptonContent.css | 6 ++++++ css/leptonContentESR.css | 3 +++ src/contents/_compatibility.scss | 3 +++ 3 files changed, 12 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index f489701..c4ab9f2 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -42,6 +42,9 @@ box-sizing: content-box; padding: 0 !important; } + button[data-l10n-id="addon-updates-manual-updates-found"] { + height: 100%; + } #categories { padding-inline-end: 1px !important; /* Original: 4px */ } @@ -3750,6 +3753,9 @@ box-sizing: content-box; padding: 0 !important; } + button[data-l10n-id="addon-updates-manual-updates-found"] { + height: 100%; + } #categories { padding-inline-end: 1px !important; /* Original: 4px */ } diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 627fee0..f1a968c 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -42,6 +42,9 @@ box-sizing: content-box; padding: 0 !important; } + button[data-l10n-id="addon-updates-manual-updates-found"] { + height: 100%; + } #categories { padding-inline-end: 1px !important; /* Original: 4px */ } diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index 3a205d2..031a73d 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -50,6 +50,9 @@ box-sizing: content-box; padding: 0 !important; } + button[data-l10n-id="addon-updates-manual-updates-found"] { + height: 100%; + } // #911 #categories { From 2795f54e658100ea0e3cef2b068e26876054adb3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 25 Aug 2024 16:32:07 +0900 Subject: [PATCH 4/8] Fix: UserContent - `about:process` profile icon hover #960 --- css/leptonContent.css | 2 ++ css/leptonContentESR.css | 1 + src/contents/proton_contents/_about_processes.scss | 3 +++ 3 files changed, 6 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index c4ab9f2..447fca7 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2271,6 +2271,7 @@ .profiler-icon { cursor: pointer; background-image: url("../icons/performance.svg") no-repeat center !important; + color: inherit !important; } @supports not -moz-bool-pref("userChrome.rounding.square_button") { .profiler-icon { @@ -6011,6 +6012,7 @@ .profiler-icon { cursor: pointer; background-image: url("../icons/performance.svg") no-repeat center !important; + color: inherit !important; } @media (-moz-bool-pref: "userContent.page.proton") and (not (-moz-bool-pref: "userChrome.rounding.square_button")) { .profiler-icon { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index f1a968c..be8a15b 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2274,6 +2274,7 @@ .profiler-icon { cursor: pointer; background-image: url("../icons/performance.svg") no-repeat center !important; + color: inherit !important; } @supports not -moz-bool-pref("userChrome.rounding.square_button") { .profiler-icon { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index b6cc84e..d1167e8 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -9,6 +9,9 @@ @include NotOption("userChrome.rounding.square_button") { border-radius: 8px !important; } + + // #960 + color: inherit !important; } } From 3a98df551f9b29f99f57954fd3c44b7f16d80227 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 25 Aug 2024 16:42:56 +0900 Subject: [PATCH 5/8] Fix: Customization - Background color #963 --- css/leptonChrome.css | 24 ++++++++++++++++++++++++ css/leptonChromeESR.css | 9 +++++++++ src/compatibility/_theme.scss | 9 +++++++++ 3 files changed, 42 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b0265b5..5d21b49 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -133,9 +133,18 @@ --tabs-border-color: rgba(0, 0, 0, 0.4); /* Legacy: v96, (0, 0, 0, 0.3) -> (0, 0, 0, 0.4) */ --lwt-tabs-border-color: rgba(0, 0, 0, 0.4); } + #main-window { + background-color: WindowFrame !important; + } + :root[lwtheme][lwtheme-image] #customization-container { + background-image: none !important; + } #customization-container { background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */ } + :root:not([lwtheme]) #customization-container { + background-color: var(--toolbar-non-lwt-bgcolor) !important; + } /*= Findbar Border Color =====================================================*/ html|input.findbar-textbox { border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ @@ -13775,11 +13784,26 @@ --lwt-tabs-border-color: rgba(0, 0, 0, 0.4); } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + #main-window { + background-color: WindowFrame !important; + } +} +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + :root[lwtheme][lwtheme-image] #customization-container { + background-image: none !important; + } +} @media (-moz-bool-pref: "userChrome.compatibility.theme") { #customization-container { background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */ } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + :root:not([lwtheme]) #customization-container { + background-color: var(--toolbar-non-lwt-bgcolor) !important; + } +} @media (-moz-bool-pref: "userChrome.compatibility.theme") { html|input.findbar-textbox { border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 53e64e4..f386ef8 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -133,9 +133,18 @@ --tabs-border-color: rgba(0, 0, 0, 0.4); /* Legacy: v96, (0, 0, 0, 0.3) -> (0, 0, 0, 0.4) */ --lwt-tabs-border-color: rgba(0, 0, 0, 0.4); } + #main-window { + background-color: WindowFrame !important; + } + :root[lwtheme][lwtheme-image] #customization-container { + background-image: none !important; + } #customization-container { background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */ } + :root:not([lwtheme]) #customization-container { + background-color: var(--toolbar-non-lwt-bgcolor) !important; + } /*= Findbar Border Color =====================================================*/ html|input.findbar-textbox { border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 2cb8861..1da19d6 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -135,9 +135,18 @@ menu { } } +#main-window { + background-color: WindowFrame !important; +} +:root[lwtheme][lwtheme-image] #customization-container { + background-image: none !important; +} #customization-container { background-color: transparent !important; /* Original: color-mix(in srgb, -moz-dialog 85%, white) */ } +:root:not([lwtheme]) #customization-container { + background-color: var(--toolbar-non-lwt-bgcolor) !important; +} /*= Findbar Border Color =====================================================*/ html|input.findbar-textbox { From 9560003715f97c0581216aff2fbcd82cd5b6ba68 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 30 Aug 2024 17:03:15 +0900 Subject: [PATCH 6/8] Doc: CREDIT - New sponsor on Ko-Fi --- CREDITS | 3 ++- README.org | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CREDITS b/CREDITS index 24c1a9c..938a65b 100644 --- a/CREDITS +++ b/CREDITS @@ -28,7 +28,8 @@ W: https://github.com/zapSNH ---------- Sponsors -N: Private sponsors - 4 +N: Private sponsors - 5 +- https://ko-fi.com/home/coffeeshop?txid=be854d98-0856-48a6-8ec2-3f2a42f0b9d0 N: Alessandro Rubino W: https://github.com/Babbiorsetto diff --git a/README.org b/README.org index b707874..5f1553a 100644 --- a/README.org +++ b/README.org @@ -215,8 +215,8 @@ Thanks to all sponsors & contributors to this project for providing help and dev - 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 + - [[https://ko-fi.com/duncanyoyo1][duncanyoyo1]] +- Private sponsors: 5 *Contributors* From 9e8498204f907fdb1d4c8474e704dccd4a335e43 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 31 Aug 2024 17:08:25 +0900 Subject: [PATCH 7/8] Doc: CREDIT - New contributor #968 --- CREDITS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index 938a65b..85ba737 100644 --- a/CREDITS +++ b/CREDITS @@ -135,6 +135,10 @@ N: hellojaccc E: kim@taekyeong.me W: https://github.com/hellojaccc +N: irhdevel +E: irihi.design@gmail.com +W: https://github.com/irhdevel + N: James Upjohn E: jammehcow@jammehcow.co.nz W: https://github.com/jammehcow From 3db45fbfe9a1618f1815f779a7dbc4d56c06626b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 3 Sep 2024 17:18:02 +0900 Subject: [PATCH 8/8] Doc: CREDIT - New big sponsoring @BrowserWorks --- CREDITS | 3 +++ README.org | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CREDITS b/CREDITS index 85ba737..faa6602 100644 --- a/CREDITS +++ b/CREDITS @@ -41,6 +41,9 @@ W: https://github.com/Cyberax N: AuRiMaS666 W: https://github.com/AuRiMaS666 +N: BrowserWorks +W: https://github.com/BrowserWorks + N: Duncanyoyo1 W: https://ko-fi.com/duncanyoyo1 diff --git a/README.org b/README.org index 5f1553a..34c8c6a 100644 --- a/README.org +++ b/README.org @@ -200,13 +200,14 @@ Thanks to all sponsors & contributors to this project for providing help and dev *Sponsors* [[https://www.oss.kr/][https://user-images.githubusercontent.com/25581533/203210367-9f2eed69-666a-4218-acde-128892aa09d8.png]] -[[https://github.com/ojaha065][@@html:@@]] -[[https://github.com/DPS0340][@@html:@@]] +[[https://github.com/BrowserWorks][@@html:@@]] +[[https://github.com/ojaha065][@@html:@@]] +[[https://github.com/DPS0340][@@html:@@]] [[https://github.com/ZachKnife1][@@html:@@]] -[[https://github.com/kanlukasz][@@html:@@]] -[[https://github.com/nikkehtine][@@html:@@]] -[[https://github.com/Babbiorsetto][@@html:@@]] -[[https://github.com/Mike-Kennelly][@@html:@@]] +[[https://github.com/kanlukasz][@@html:@@]] +[[https://github.com/nikkehtine][@@html:@@]] +[[https://github.com/Babbiorsetto][@@html:@@]] +[[https://github.com/Mike-Kennelly][@@html:@@]] [[https://github.com/Cyberax][@@html:@@]] [[https://github.com/AuRiMaS666][@@html:@@]] [[https://github.com/firefox9067][@@html:@@]]