From a1f1ff5c9994c3a5458c4c7e5f06b54619a9a685 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 6 Jul 2024 20:52:02 +0900 Subject: [PATCH 01/34] Fix: Icons - Replace `edit` as acorn design system #935 --- css/leptonChrome.css | 20 ++++++++++---------- css/leptonChromeESR.css | 10 +++++----- css/leptonContent.css | 8 ++++---- css/leptonContentESR.css | 4 ++-- icons/edit-active.svg | 3 +++ src/icons/_activity_stream.scss | 2 +- src/icons/_global_menubar.scss | 2 +- src/icons/context_menu/_others.scss | 2 +- src/icons/context_menu/_place.scss | 2 +- src/icons/context_menu/_tab_toolbar.scss | 2 +- src/icons/fork_browsers/_floorp.scss | 2 +- 11 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 icons/edit-active.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index dac3290..3bb3aad 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12332,7 +12332,7 @@ } } #tm-renameTab { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); @@ -12778,7 +12778,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, @@ -12842,7 +12842,7 @@ --menuitem-image: url("chrome://global/skin/icons/check.svg"); } #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #blockedPopupDontShowMessage { /* checkbox */ @@ -13084,7 +13084,7 @@ --menuitem-image: url("../icons/mail-inbox-all.svg"); } #edit-menu { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #view-menu { --menuitem-image: url("../icons/content-view.svg"); @@ -13562,7 +13562,7 @@ --menuitem-image: url("chrome://global/skin/icons/reload.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { --menuitem-image: var(--uc-folder-icon); @@ -27309,7 +27309,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #tm-renameTab { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -27994,7 +27994,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -28094,7 +28094,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { @@ -28426,7 +28426,7 @@ --menuitem-image: url("../icons/mail-inbox-all.svg"); } #edit-menu { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #view-menu { --menuitem-image: url("../icons/content-view.svg"); @@ -29078,7 +29078,7 @@ --menuitem-image: url("chrome://global/skin/icons/reload.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { --menuitem-image: var(--uc-folder-icon); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 699c3e0..8b08ca5 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12963,7 +12963,7 @@ } } #tm-renameTab { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); @@ -13409,7 +13409,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, @@ -13473,7 +13473,7 @@ --menuitem-image: url("chrome://global/skin/icons/check.svg"); } #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #blockedPopupDontShowMessage { /* checkbox */ @@ -13715,7 +13715,7 @@ --menuitem-image: url("../icons/mail-inbox-all.svg"); } #edit-menu { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #view-menu { --menuitem-image: url("../icons/content-view.svg"); @@ -14193,7 +14193,7 @@ --menuitem-image: url("chrome://global/skin/icons/reload.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="make-browsercss-file"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #usercssloader-submenupopup > menuitem[data-l10n-id="open-css-folder"] { --menuitem-image: var(--uc-folder-icon); diff --git a/css/leptonContent.css b/css/leptonContent.css index 7e5a57a..3529297 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -321,7 +321,7 @@ --menuitem-image: url("../icons/unpin-tab.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3493,7 +3493,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, @@ -3993,7 +3993,7 @@ --menuitem-image: url("../icons/unpin-tab.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -7274,7 +7274,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 40ab7f0..a4b16d6 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -321,7 +321,7 @@ --menuitem-image: url("../icons/unpin-tab.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); @@ -3632,7 +3632,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, diff --git a/icons/edit-active.svg b/icons/edit-active.svg new file mode 100644 index 0000000..2a43922 --- /dev/null +++ b/icons/edit-active.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/_activity_stream.scss b/src/icons/_activity_stream.scss index b916a3e..bfc362b 100644 --- a/src/icons/_activity_stream.scss +++ b/src/icons/_activity_stream.scss @@ -5,7 +5,7 @@ --menuitem-image: url("../icons/unpin-tab.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); diff --git a/src/icons/_global_menubar.scss b/src/icons/_global_menubar.scss index e477397..9801021 100644 --- a/src/icons/_global_menubar.scss +++ b/src/icons/_global_menubar.scss @@ -3,7 +3,7 @@ --menuitem-image: url("../icons/mail-inbox-all.svg"); } #edit-menu { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #view-menu { --menuitem-image: url("../icons/content-view.svg"); diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 98f40ae..b156633 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -15,7 +15,7 @@ --menuitem-image: url("chrome://global/skin/icons/check.svg"); } #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #blockedPopupDontShowMessage { /* checkbox */ diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss index ff23f51..4764c72 100644 --- a/src/icons/context_menu/_place.scss +++ b/src/icons/context_menu/_place.scss @@ -24,7 +24,7 @@ #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #placesContext_deleteBookmark, #placesContext_deleteFolder, diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 2488d3b..a3ec4f3 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -243,7 +243,7 @@ menuitem.viewCustomizeToolbar { } } #tm-renameTab { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 67c3947..7947326 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -47,7 +47,7 @@ } &[data-l10n-id="make-browsercss-file"] { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + --menuitem-image: url("../icons/edit-active.svg"); } &[data-l10n-id="open-css-folder"] { --menuitem-image: var(--uc-folder-icon); From f07e9f4f331fc3512f144c91068bc9f69944c114 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 7 Jul 2024 14:34:06 +0900 Subject: [PATCH 02/34] Fix: Icons - Ask to AIChat After wrestling with the wand, we decided to make it more clear that it's a chat. https://techcrunch.com/2024/06/15/apple-joins-the-race-to-find-an-ai-icon-that-makes-sense/ --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 3 +++ icons/chat-sparkle.svg | 3 +++ src/icons/context_menu/_content_area.scss | 3 +++ 4 files changed, 17 insertions(+) create mode 100644 icons/chat-sparkle.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3bb3aad..408a631 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12591,6 +12591,9 @@ #context-translate-selection { --menuitem-image: url("../icons/translations.svg"); } + #context-ask-chat { + --menuitem-image: url("../icons/chat-sparkle.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } @@ -27710,6 +27713,11 @@ --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") { + #context-ask-chat { + --menuitem-image: url("../icons/chat-sparkle.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"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 8b08ca5..edcd086 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13222,6 +13222,9 @@ #context-translate-selection { --menuitem-image: url("../icons/translations.svg"); } + #context-ask-chat { + --menuitem-image: url("../icons/chat-sparkle.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } diff --git a/icons/chat-sparkle.svg b/icons/chat-sparkle.svg new file mode 100644 index 0000000..94ab3ef --- /dev/null +++ b/icons/chat-sparkle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 7cad874..5c884cf 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -232,6 +232,9 @@ #context-translate-selection { --menuitem-image: url("../icons/translations.svg"); } +#context-ask-chat { + --menuitem-image: url("../icons/chat-sparkle.svg"); +} #frame { --menuitem-image: url("../icons/command-frames.svg"); From 5fe1a8418f24d89985e7574a4d207878d2121b06 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 8 Jul 2024 00:11:41 +0900 Subject: [PATCH 03/34] Add: Content - `about:support` refresh button as danger color #941 --- css/leptonContent.css | 40 +++++++++++++++++++ css/leptonContentESR.css | 19 +++++++++ src/contents/_proton_contents.scss | 3 ++ .../proton_contents/_about_others.scss | 19 +++++++++ 4 files changed, 81 insertions(+) create mode 100644 src/contents/proton_contents/_about_others.scss diff --git a/css/leptonContent.css b/css/leptonContent.css index 3529297..f646505 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2266,6 +2266,25 @@ background-image: url("../icons/performance.svg") !important; } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:support") { + #reset-box-button { + --in-content-focus-outline-color: var(--in-content-danger-button-background) !important; + background-color: var(--in-content-danger-button-background) !important; + color: var(--in-content-primary-button-text-color) !important; + border-color: var(--in-content-primary-button-border-color) !important; + } + #reset-box-button:enabled:hover { + background-color: var(--in-content-danger-button-background-hover) !important; + color: var(--in-content-primary-button-text-color-hover) !important; + border-color: var(--in-content-primary-button-border-hover) !important; + } + #reset-box-button:enabled:hover:active { + background-color: var(--in-content-danger-button-background-active) !important; + color: var(--in-content-primary-button-text-color-active) !important; + border-color: var(--in-content-primary-button-border-active) !important; + } + } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { @@ -5786,6 +5805,7 @@ /*= about:memory =============================================================*/ /*= about:preferences ========================================================*/ /*= about:processes ==========================================================*/ + /*= 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) { @@ -5967,6 +5987,26 @@ } } } +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:support") { + #reset-box-button { + --in-content-focus-outline-color: var(--in-content-danger-button-background) !important; + background-color: var(--in-content-danger-button-background) !important; + color: var(--in-content-primary-button-text-color) !important; + border-color: var(--in-content-primary-button-border-color) !important; + } + #reset-box-button:enabled:hover { + background-color: var(--in-content-danger-button-background-hover) !important; + color: var(--in-content-primary-button-text-color-hover) !important; + border-color: var(--in-content-primary-button-border-hover) !important; + } + #reset-box-button:enabled:hover:active { + background-color: var(--in-content-danger-button-background-active) !important; + color: var(--in-content-primary-button-text-color-active) !important; + border-color: var(--in-content-primary-button-border-active) !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 a4b16d6..52ce925 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2269,6 +2269,25 @@ background-image: url("../icons/performance.svg") !important; } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:support") { + #reset-box-button { + --in-content-focus-outline-color: var(--in-content-danger-button-background) !important; + background-color: var(--in-content-danger-button-background) !important; + color: var(--in-content-primary-button-text-color) !important; + border-color: var(--in-content-primary-button-border-color) !important; + } + #reset-box-button:enabled:hover { + background-color: var(--in-content-danger-button-background-hover) !important; + color: var(--in-content-primary-button-text-color-hover) !important; + border-color: var(--in-content-primary-button-border-hover) !important; + } + #reset-box-button:enabled:hover:active { + background-color: var(--in-content-danger-button-background-active) !important; + color: var(--in-content-primary-button-text-color-active) !important; + border-color: var(--in-content-primary-button-border-active) !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 2a06c7a..ca094dd 100644 --- a/src/contents/_proton_contents.scss +++ b/src/contents/_proton_contents.scss @@ -32,5 +32,8 @@ /*= about:processes ==========================================================*/ @import "proton_contents/about_processes"; +/*= about:processes ==========================================================*/ +@import "proton_contents/about_others"; + /*= chrome://browser/content/places/places.xhtml =============================*/ @import "../library/contents"; diff --git a/src/contents/proton_contents/_about_others.scss b/src/contents/proton_contents/_about_others.scss new file mode 100644 index 0000000..e55a476 --- /dev/null +++ b/src/contents/proton_contents/_about_others.scss @@ -0,0 +1,19 @@ +@include moz-document(url-prefix "about:support") { + #reset-box-button { + --in-content-focus-outline-color: var(--in-content-danger-button-background) !important; + background-color: var(--in-content-danger-button-background) !important; + color: var(--in-content-primary-button-text-color) !important; + border-color: var(--in-content-primary-button-border-color) !important; + + &:enabled:hover { + background-color: var(--in-content-danger-button-background-hover) !important; + color: var(--in-content-primary-button-text-color-hover) !important; + border-color: var(--in-content-primary-button-border-hover) !important; + } + &:enabled:hover:active { + background-color: var(--in-content-danger-button-background-active) !important; + color: var(--in-content-primary-button-text-color-active) !important; + border-color: var(--in-content-primary-button-border-active) !important; + } + } +} From ce22061acac4f6d4719a5dfd7a70d5f0848dcfcd Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 9 Jul 2024 01:10:33 +0900 Subject: [PATCH 04/34] Fix: Content - folder icon rule as locally #938 --- css/leptonContent.css | 36 ++++++++++++++++----------------- css/leptonContentESR.css | 13 +++++++----- src/contents/_context_menu.scss | 10 +++++++-- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index f646505..09dabb9 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -3265,12 +3265,15 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { :root { - --uc-folder-icon: url("../icons/folder.svg"); + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } } } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") @@ -7071,16 +7074,17 @@ } /** Menu - Icons Layout *******************************************************/ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { + :root { + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } + } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") { - :root { - --uc-folder-icon: url("../icons/folder.svg"); - } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), @@ -7452,8 +7456,6 @@ } } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url-prefix("about:addons") { @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { button[role="menuitem"] { @@ -7484,8 +7486,6 @@ } } } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @-moz-document url-prefix("about:logins") { @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .menuitem-export { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 52ce925..8d41bd5 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -3268,12 +3268,15 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - :root { - --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { + @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + { :root { - --uc-folder-icon: url("../icons/folder.svg"); + --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + :root { + --uc-folder-icon: url("../icons/folder.svg"); + } } } @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads") diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss index daec5c7..c505af7 100644 --- a/src/contents/_context_menu.scss +++ b/src/contents/_context_menu.scss @@ -1,6 +1,12 @@ @import "../icons/shared"; -:root { - @include initIcons; + +@include moz-document( + url-prefix "about:", + regexp "^(((jar:)?file:\/\/\/)|(chrome:\/\/)).*\/$" +) { + :root { + @include initIcons; + } } @include moz-document( From 4b6a1d787b8ebfebc26c6ebb33b9a9a7fe8dbdd2 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Fri, 19 Jul 2024 18:52:47 +0900 Subject: [PATCH 05/34] Doc: Fix update by github convention --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 541c511..91eea31 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -15,4 +15,4 @@ # custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] github: [black7375] -ko_fi: [black7375] +ko_fi: black7375 From a49503131979caeea68ec2fe04ffcf7a73a685d0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 22 Jul 2024 14:15:44 +0900 Subject: [PATCH 06/34] Fix: Setting - Change option name from upstream(v128) #947 --- user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user.js b/user.js index 06aa26f..2bcd415 100644 --- a/user.js +++ b/user.js @@ -283,7 +283,7 @@ user_pref("userContent.page.proton", true); // Need proton_color // ** Useful Options *********************************************************** // Tab preview // https://blog.nightly.mozilla.org/2024/02/06/a-preview-of-tab-previews-these-weeks-in-firefox-issue-153/ -user_pref("browser.tabs.cardPreview.enabled", true); +user_pref("browser.tabs.hoverPreview.enabled", true); // Paste suggestion at urlbar // https://blog.nightly.mozilla.org/2023/12/04/url-gonna-want-to-check-this-out-these-weeks-in-firefox-issue-150/ From c01458d8913e15256520fc8a6d73205214afbfee Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 7 Aug 2024 13:38:08 +0900 Subject: [PATCH 07/34] Fix: Icons - Tree style tab #949 --- css/leptonChrome.css | 16 ++++++++++++++++ css/leptonChromeESR.css | 8 ++++++++ icons/align-distribute-top.svg | 3 +++ icons/align-space-evenly-vertical.svg | 3 +++ icons/arrow-between-up.svg | 3 +++ src/icons/context_menu/_tab_toolbar.scss | 8 ++++++++ 6 files changed, 41 insertions(+) create mode 100644 icons/align-distribute-top.svg create mode 100644 icons/align-space-evenly-vertical.svg create mode 100644 icons/arrow-between-up.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 408a631..7c58202 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12142,6 +12142,7 @@ } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { @@ -12150,6 +12151,7 @@ } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] { @@ -12169,6 +12171,12 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] { --menuitem-image: url("../icons/unpin-tab.svg"); } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] { + --menuitem-image: url("../icons/align-distribute-top.svg"); + } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] { + --menuitem-image: url("../icons/align-space-evenly-vertical.svg"); + } #context_duplicateTab, #context_duplicateTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, @@ -27051,6 +27059,7 @@ } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { @@ -27059,6 +27068,7 @@ } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] { @@ -27078,6 +27088,12 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] { --menuitem-image: url("../icons/unpin-tab.svg"); } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] { + --menuitem-image: url("../icons/align-distribute-top.svg"); + } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] { + --menuitem-image: url("../icons/align-space-evenly-vertical.svg"); + } #context_duplicateTab, #context_duplicateTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index edcd086..71104aa 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12770,6 +12770,7 @@ } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { @@ -12778,6 +12779,7 @@ } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] { @@ -12797,6 +12799,12 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] { --menuitem-image: url("../icons/unpin-tab.svg"); } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] { + --menuitem-image: url("../icons/align-distribute-top.svg"); + } + #treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] { + --menuitem-image: url("../icons/align-space-evenly-vertical.svg"); + } #context_duplicateTab, #context_duplicateTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, diff --git a/icons/align-distribute-top.svg b/icons/align-distribute-top.svg new file mode 100644 index 0000000..7347d7d --- /dev/null +++ b/icons/align-distribute-top.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/align-space-evenly-vertical.svg b/icons/align-space-evenly-vertical.svg new file mode 100644 index 0000000..9a3318a --- /dev/null +++ b/icons/align-space-evenly-vertical.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/arrow-between-up.svg b/icons/arrow-between-up.svg new file mode 100644 index 0000000..24a77e9 --- /dev/null +++ b/icons/arrow-between-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index a3ec4f3..0e186b1 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -24,6 +24,7 @@ } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, +#treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { @@ -32,6 +33,7 @@ } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], +#treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Unmute Tab"], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] { @@ -51,6 +53,12 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] { --menuitem-image: url("../icons/unpin-tab.svg"); } +#treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Stick Tab to Edges"] { + --menuitem-image: url("../icons/align-distribute-top.svg"); +} +#treestyletab_piro_sakura_ne_jp-menuitem-_context_topLevel_toggleSticky[label="Unstick Tab to Edges"] { + --menuitem-image: url("../icons/align-space-evenly-vertical.svg"); +} #context_duplicateTab, #context_duplicateTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, From 10a8dc20aa38528e480c38c1f56e066601f01e87 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 8 Aug 2024 14:06:33 +0900 Subject: [PATCH 08/34] Fix: `about:process` profile button hover #948 --- css/leptonContent.css | 16 ++++++++++++++-- css/leptonContentESR.css | 8 +++++++- .../proton_contents/_about_processes.scss | 6 +++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 09dabb9..bfa4e23 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2258,7 +2258,13 @@ background-image: url("../icons/link.svg") !important; } .profiler-icon { - background: url("../icons/performance.svg") no-repeat center !important; + cursor: pointer; + background-image: url("../icons/performance.svg") no-repeat center !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + .profiler-icon { + border-radius: 8px !important; + } } } @-moz-document url-prefix("about:profiling") { @@ -5979,7 +5985,13 @@ background-image: url("../icons/link.svg") !important; } .profiler-icon { - background: url("../icons/performance.svg") no-repeat center !important; + cursor: pointer; + background-image: url("../icons/performance.svg") no-repeat center !important; + } + @media (-moz-bool-pref: "userContent.page.proton") and (not (-moz-bool-pref: "userChrome.rounding.square_button")) { + .profiler-icon { + border-radius: 8px !important; + } } } } diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 8d41bd5..de0c405 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2261,7 +2261,13 @@ background-image: url("../icons/link.svg") !important; } .profiler-icon { - background: url("../icons/performance.svg") no-repeat center !important; + cursor: pointer; + background-image: url("../icons/performance.svg") no-repeat center !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + .profiler-icon { + border-radius: 8px !important; + } } } @-moz-document url-prefix("about:profiling") { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index 7d52b32..b6cc84e 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -4,7 +4,11 @@ } .profiler-icon { - background: url("../icons/performance.svg") no-repeat center !important; + cursor: pointer; + background-image: url("../icons/performance.svg") no-repeat center !important; + @include NotOption("userChrome.rounding.square_button") { + border-radius: 8px !important; + } } } From e1987d1ff7e08c13319e289a88d5f7b9d688de96 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 9 Aug 2024 14:23:32 +0900 Subject: [PATCH 09/34] Fix: UserContent - `about:preferences` Adjust item spacing #952 --- css/leptonContent.css | 18 ++++++++++++++++++ css/leptonContentESR.css | 8 ++++++++ .../proton_contents/_about_preferences.scss | 9 +++++++++ 3 files changed, 35 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index bfa4e23..f489701 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2251,6 +2251,14 @@ background-color: var(--in-content-box-background-odd); } } + @-moz-document url-prefix("about:preferences") { + .privacy-extra-information > .custom-option:not(:first-child) { + margin-block: 2px !important; /* Original: 10px */ + } + .extra-information-label:not(:first-child) { + margin-top: 4px !important; /* Original: 19px */ + } + } /*= about:processes ==========================================================*/ @-moz-document url-prefix("about:processes") { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] @@ -5978,6 +5986,16 @@ } } } +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:preferences") { + .privacy-extra-information > .custom-option:not(:first-child) { + margin-block: 2px !important; /* Original: 10px */ + } + .extra-information-label:not(:first-child) { + margin-top: 4px !important; /* Original: 19px */ + } + } +} @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");'] diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index de0c405..627fee0 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2254,6 +2254,14 @@ background-color: var(--in-content-box-background-odd); } } + @-moz-document url-prefix("about:preferences") { + .privacy-extra-information > .custom-option:not(:first-child) { + margin-block: 2px !important; /* Original: 10px */ + } + .extra-information-label:not(:first-child) { + margin-top: 4px !important; /* Original: 19px */ + } + } /*= about:processes ==========================================================*/ @-moz-document url-prefix("about:processes") { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] diff --git a/src/contents/proton_contents/_about_preferences.scss b/src/contents/proton_contents/_about_preferences.scss index d8a43f1..4ef7326 100644 --- a/src/contents/proton_contents/_about_preferences.scss +++ b/src/contents/proton_contents/_about_preferences.scss @@ -23,3 +23,12 @@ } } } +@include moz-document(url-prefix "about:preferences") { + // #952 + .privacy-extra-information > .custom-option:not(:first-child) { + margin-block: 2px !important; /* Original: 10px */ + } + .extra-information-label:not(:first-child) { + margin-top: 4px !important; /* Original: 19px */ + } +} From c79922aa45ff04a62e04ef0f8562dc53990b5208 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 9 Aug 2024 15:43:32 +0900 Subject: [PATCH 10/34] Fix: Icons - Play icon at tab context menu #955 --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 4 ++++ icons/play-fill.svg | 3 +++ src/icons/context_menu/_tab_toolbar.scss | 4 ++++ 4 files changed, 19 insertions(+) create mode 100644 icons/play-fill.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7c58202..f5a4862 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -12140,6 +12140,10 @@ #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } + #context_playTab, + #context_playSelectedTabs { + --menuitem-image: url("../icons/play-fill.svg"); + } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], @@ -27057,6 +27061,10 @@ #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } + #context_playTab, + #context_playSelectedTabs { + --menuitem-image: url("../icons/play-fill.svg"); + } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 71104aa..013dd51 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12768,6 +12768,10 @@ #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } + #context_playTab, + #context_playSelectedTabs { + --menuitem-image: url("../icons/play-fill.svg"); + } #context_toggleMuteTab, #context_toggleMuteSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], diff --git a/icons/play-fill.svg b/icons/play-fill.svg new file mode 100644 index 0000000..59192b0 --- /dev/null +++ b/icons/play-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 0e186b1..b95f525 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -22,6 +22,10 @@ #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } +#context_playTab, +#context_playSelectedTabs { + --menuitem-image: url("../icons/play-fill.svg"); +} #context_toggleMuteTab, #context_toggleMuteSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab[label="Mute Tab"], From 823d878916434c17b40cfc5fd9a0c3b394f7a656 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 19 Aug 2024 14:44:26 +0900 Subject: [PATCH 11/34] 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 12/34] 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 13/34] 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 14/34] 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 15/34] 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 9584a7621ddfa0d5b764b89e1a88088a4b247882 Mon Sep 17 00:00:00 2001 From: irhdevel Date: Mon, 26 Aug 2024 04:56:48 +0900 Subject: [PATCH 16/34] Add: Tab - Supernova like Selected Tab ContextLine --- css/leptonChrome.css | 230 ++++++++++++++++++ css/leptonChromeESR.css | 111 +++++++++ src/tab/_selected_tab.scss | 6 + .../_supernova_like_contextline.scss | 117 +++++++++ user.js | 3 + 5 files changed, 467 insertions(+) create mode 100644 src/tab/selected_tab/_supernova_like_contextline.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index f5a4862..56ebe83 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7460,6 +7460,117 @@ margin: unset !important; } } +@supports not -moz-bool-pref("userChrome.tab.photon_like_contextline") { + @supports -moz-bool-pref("userChrome.tab.supernova_like_contextline") { + .tab-context-line { + display: inline-flex !important; + display: -moz-inline-box !important; + height: 1px !important; + border-radius: 9999px !important; + margin-top: 3px; + margin-left: 5px; + margin-right: 5px; + } + /* Override container tab style */ + tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { + margin-top: 3px !important; + margin-left: 5px !important; + margin-right: 5px !important; + } + tab.tabbrowser-tab[usercontextid]:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 0; + transition: all 0.2s cubic-bezier(0, 0.9, 0.15, 1) !important; + } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: #45a1ff; + } + .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { + background-color: var(--tab-line-color, #45a1ff) !important; + } + /* Set the active effect */ + tabs tab.tabbrowser-tab[usercontextid]:active > .tab-stack > .tab-background > .tab-context-line { + margin-left: 6px !important; + margin-right: 6px !important; + } + .tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line { + background: #217ddb !important; + margin-left: 6px; + margin-right: 6px; + } + /* Set the hover effect */ + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + background-color: rgba(0, 0, 0, 0.2) !important; + opacity: 1 !important; + transform: none !important; + } + #TabsToolbar[brighttext] + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + background-color: rgba(255, 255, 255, 0.3137254902) !important; + } + /* Animation */ + @media (prefers-reduced-motion: no-preference) { + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1); + } + /* Animation for container tab can't have width change... */ + tab.tabbrowser-tab[usercontextid]:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 1; + } + } + /* Animation for hover effect */ + @keyframes toWide { + 0% { + opacity: 0.8; + margin-left: 40%; + margin-right: 40%; + } + 100% { + opacity: 1; + margin-left: 5px; + margin-right: 5px; + } + } + /* --- copied (not modified) from _photon_like_contextline.scss --- */ + /* Prevent identity color flashing */ + .tabbrowser-tab[usercontextid] .tab-context-line { + --identity-icon-color: none; + } + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before, + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after { + /* As Selected Tab - Box Shadow */ + stroke: var(--toolbar-color) !important; + } + /* Remove side's background color border */ + :root:is(:-moz-lwtheme, [lwtheme]) + #TabsToolbar[brighttext] + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + --tabs-border-color: rgba(0, 0, 0, 0.3) !important; + box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ + } + #TabsToolbar:not([brighttext]) + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ + } + } +} /*= Unselected Tab - Divide line =============================================*/ /*= Unselected Tab - Dynamic Separator =======================================*/ @supports -moz-bool-pref("userChrome.tab.dynamic_separator") { @@ -21798,6 +21909,125 @@ margin: unset !important; } } +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + .tab-context-line { + display: inline-flex !important; + display: -moz-inline-box !important; + height: 1px !important; + border-radius: 9999px !important; + margin-top: 3px; + margin-left: 5px; + margin-right: 5px; + } + /* Override container tab style */ + tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { + margin-top: 3px !important; + margin-left: 5px !important; + margin-right: 5px !important; + } + tab.tabbrowser-tab[usercontextid]:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 0; + transition: all 0.2s cubic-bezier(0, 0.9, 0.15, 1) !important; + } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: #45a1ff; + } + .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { + background-color: var(--tab-line-color, #45a1ff) !important; + } + /* Set the active effect */ + tabs tab.tabbrowser-tab[usercontextid]:active > .tab-stack > .tab-background > .tab-context-line { + margin-left: 6px !important; + margin-right: 6px !important; + } + .tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line { + background: #217ddb !important; + margin-left: 6px; + margin-right: 6px; + } + /* Set the hover effect */ + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + background-color: rgba(0, 0, 0, 0.2) !important; + opacity: 1 !important; + transform: none !important; + } + #TabsToolbar[brighttext] + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + background-color: rgba(255, 255, 255, 0.3137254902) !important; + } + /* Animation */ + /* Animation for hover effect */ + /* --- copied (not modified) from _photon_like_contextline.scss --- */ + /* Prevent identity color flashing */ + /* Remove side's background color border */ +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") and (prefers-reduced-motion: no-preference) { + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1); + } + /* Animation for container tab can't have width change... */ + tab.tabbrowser-tab[usercontextid]:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 1; + } +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + @keyframes toWide { + 0% { + opacity: 0.8; + margin-left: 40%; + margin-right: 40%; + } + 100% { + opacity: 1; + margin-left: 5px; + margin-right: 5px; + } + } +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + .tabbrowser-tab[usercontextid] .tab-context-line { + --identity-icon-color: none; + } +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before, + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after { + /* As Selected Tab - Box Shadow */ + stroke: var(--toolbar-color) !important; + } +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + :root:is(:-moz-lwtheme, [lwtheme]) + #TabsToolbar[brighttext] + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + --tabs-border-color: rgba(0, 0, 0, 0.3) !important; + box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ + } +} +@media (not (-moz-bool-pref: "userChrome.tab.photon_like_contextline")) and (-moz-bool-pref: "userChrome.tab.supernova_like_contextline") { + #TabsToolbar:not([brighttext]) + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ + } +} /*= Unselected Tab - Divide line =============================================*/ /*= Unselected Tab - Dynamic Separator =======================================*/ @media (-moz-bool-pref: "userChrome.tab.dynamic_separator") { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 013dd51..7837d15 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7890,6 +7890,117 @@ margin: unset !important; } } +@supports not -moz-bool-pref("userChrome.tab.photon_like_contextline") { + @supports -moz-bool-pref("userChrome.tab.supernova_like_contextline") { + .tab-context-line { + display: inline-flex !important; + display: -moz-inline-box !important; + height: 1px !important; + border-radius: 9999px !important; + margin-top: 3px; + margin-left: 5px; + margin-right: 5px; + } + /* Override container tab style */ + tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { + margin-top: 3px !important; + margin-left: 5px !important; + margin-right: 5px !important; + } + tab.tabbrowser-tab[usercontextid]:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 0; + transition: all 0.2s cubic-bezier(0, 0.9, 0.15, 1) !important; + } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: #45a1ff; + } + .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { + background-color: var(--tab-line-color, #45a1ff) !important; + } + /* Set the active effect */ + tabs tab.tabbrowser-tab[usercontextid]:active > .tab-stack > .tab-background > .tab-context-line { + margin-left: 6px !important; + margin-right: 6px !important; + } + .tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line { + background: #217ddb !important; + margin-left: 6px; + margin-right: 6px; + } + /* Set the hover effect */ + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + background-color: rgba(0, 0, 0, 0.2) !important; + opacity: 1 !important; + transform: none !important; + } + #TabsToolbar[brighttext] + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + background-color: rgba(255, 255, 255, 0.3137254902) !important; + } + /* Animation */ + @media (prefers-reduced-motion: no-preference) { + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1); + } + /* Animation for container tab can't have width change... */ + tab.tabbrowser-tab[usercontextid]:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 1; + } + } + /* Animation for hover effect */ + @keyframes toWide { + 0% { + opacity: 0.8; + margin-left: 40%; + margin-right: 40%; + } + 100% { + opacity: 1; + margin-left: 5px; + margin-right: 5px; + } + } + /* --- copied (not modified) from _photon_like_contextline.scss --- */ + /* Prevent identity color flashing */ + .tabbrowser-tab[usercontextid] .tab-context-line { + --identity-icon-color: none; + } + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before, + :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after { + /* As Selected Tab - Box Shadow */ + stroke: var(--toolbar-color) !important; + } + /* Remove side's background color border */ + :root:is(:-moz-lwtheme, [lwtheme]) + #TabsToolbar[brighttext] + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + --tabs-border-color: rgba(0, 0, 0, 0.3) !important; + box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ + } + #TabsToolbar:not([brighttext]) + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ + } + } +} /*= Unselected Tab - Divide line =============================================*/ /*= Unselected Tab - Dynamic Separator =======================================*/ @supports -moz-bool-pref("userChrome.tab.dynamic_separator") { diff --git a/src/tab/_selected_tab.scss b/src/tab/_selected_tab.scss index c2c3592..774b474 100644 --- a/src/tab/_selected_tab.scss +++ b/src/tab/_selected_tab.scss @@ -67,3 +67,9 @@ @include Option("userChrome.tab.photon_like_contextline") { @import "selected_tab/photon_like_contextline"; } + +@include NotOption("userChrome.tab.photon_like_contextline") { + @include Option("userChrome.tab.supernova_like_contextline") { + @import "selected_tab/supernova_like_contextline"; + } +} diff --git a/src/tab/selected_tab/_supernova_like_contextline.scss b/src/tab/selected_tab/_supernova_like_contextline.scss new file mode 100644 index 0000000..b769a39 --- /dev/null +++ b/src/tab/selected_tab/_supernova_like_contextline.scss @@ -0,0 +1,117 @@ +.tab-context-line { + @include InlineBox(true); + height: 1px !important; + border-radius: 9999px !important; + margin-top: 3px; + margin-left: 5px; + margin-right: 5px; +} + +/* Override container tab style */ +tabs tab.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { + margin-top: 3px !important; + margin-left: 5px !important; + margin-right: 5px !important; +} + +tab.tabbrowser-tab[usercontextid]:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 0; + transition: all 0.2s cubic-bezier(0, 0.9, 0.15, 1) !important; +} + +#{built-in-light-theme()} .tab-context-line, +#{built-in-dark-theme()} .tab-context-line { + --tab-line-color: #45a1ff; +} +.tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { + background-color: var(--tab-line-color, #45a1ff) !important; +} + +/* Set the active effect */ +tabs tab.tabbrowser-tab[usercontextid]:active > .tab-stack > .tab-background > .tab-context-line { + margin-left: 6px !important; + margin-right: 6px !important; +} + +.tabbrowser-tab:active > .tab-stack > .tab-background > .tab-context-line { + background: #217ddb !important; + margin-left: 6px; + margin-right: 6px; +} + +/* Set the hover effect */ +.tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + background-color: rgba(0, 0, 0, 0.2) !important; + opacity: 1 !important; + transform: none !important; +} + +#TabsToolbar[brighttext] + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + background-color: #ffffff50 !important; +} + +/* Animation */ +@media (prefers-reduced-motion: no-preference) { + .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { + animation: toWide 0.2s cubic-bezier(0, 0.9, 0.15, 1); + } + + /* Animation for container tab can't have width change... */ + tab.tabbrowser-tab[usercontextid]:hover:not([selected="true"], [multiselected]) + > .tab-stack + > .tab-background + > .tab-context-line { + opacity: 1; + } +} + +/* Animation for hover effect */ +@keyframes toWide { + 0% { + opacity: 0.8; + margin-left: 40%; + margin-right: 40%; + } + 100% { + opacity: 1; + margin-left: 5px; + margin-right: 5px; + } +} + +/* --- copied (not modified) from _photon_like_contextline.scss --- */ + +/* Prevent identity color flashing */ +.tabbrowser-tab[usercontextid] .tab-context-line { + --identity-icon-color: none; +} +:root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before, +:root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after { + /* As Selected Tab - Box Shadow */ + stroke: var(--toolbar-color) !important; +} + +/* Remove side's background color border */ +:root#{$lwtheme} + #TabsToolbar[brighttext] + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + --tabs-border-color: rgba(0, 0, 0, 0.3) !important; + box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ +} +#TabsToolbar:not([brighttext]) + #tabbrowser-tabs:not([noshadowfortests]) + .tabbrowser-tab:is([visuallyselected], [multiselected]) + > .tab-stack + > .tab-background { + box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ +} diff --git a/user.js b/user.js index 2bcd415..2fe7376 100644 --- a/user.js +++ b/user.js @@ -47,6 +47,9 @@ user_pref("userChrome.tab.bottom_rounded_corner", true); user_pref("userChrome.tab.photon_like_contextline", false); user_pref("userChrome.rounding.square_tab", false); +// Proton Only +// user_pref("userChrome.tab.supernova_like_contextline", true); + // == Theme Compatibility Settings ============================================= // user_pref("userChrome.compatibility.accent_color", true); // Firefox v103 Below // user_pref("userChrome.compatibility.covered_header_image", true); From 9560003715f97c0581216aff2fbcd82cd5b6ba68 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 30 Aug 2024 17:03:15 +0900 Subject: [PATCH 17/34] 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 18/34] 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 19/34] 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:@@]] From 227c6af7ac8bef8598759c324e7a82a945fdc1d9 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 7 Sep 2024 15:36:05 +0900 Subject: [PATCH 20/34] Fix: Fullscreen hover behavior #979 --- css/leptonChrome.css | 6 ++++++ css/leptonChromeESR.css | 3 +++ src/fullscreen/_overlap.scss | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b1d7c70..4e8b48f 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9826,6 +9826,9 @@ position: fixed !important; /* Needed for content to take up entire height */ z-index: 1000 !important; /* Puts the UI above the content */ } + :root[sizemode="fullscreen"] #navigator-toolbox:is(:hover, :focus-within) { + margin-top: 0 !important; + } :root[sizemode="fullscreen"] :-moz-any(#navigator-toolbox, #titlebar, #nav-bar, #PersonalToolbar) { width: 100%; /* Makes the UI take up the entire width */ } @@ -24441,6 +24444,9 @@ position: fixed !important; /* Needed for content to take up entire height */ z-index: 1000 !important; /* Puts the UI above the content */ } + :root[sizemode="fullscreen"] #navigator-toolbox:is(:hover, :focus-within) { + margin-top: 0 !important; + } :root[sizemode="fullscreen"] :-moz-any(#navigator-toolbox, #titlebar, #nav-bar, #PersonalToolbar) { width: 100%; /* Makes the UI take up the entire width */ } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 95bee1b..de809a1 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -10256,6 +10256,9 @@ position: fixed !important; /* Needed for content to take up entire height */ z-index: 1000 !important; /* Puts the UI above the content */ } + :root[sizemode="fullscreen"] #navigator-toolbox:is(:hover, :focus-within) { + margin-top: 0 !important; + } :root[sizemode="fullscreen"] :-moz-any(#navigator-toolbox, #titlebar, #nav-bar, #PersonalToolbar) { width: 100%; /* Makes the UI take up the entire width */ } diff --git a/src/fullscreen/_overlap.scss b/src/fullscreen/_overlap.scss index 4838ed3..8f0ff5d 100644 --- a/src/fullscreen/_overlap.scss +++ b/src/fullscreen/_overlap.scss @@ -1,6 +1,10 @@ :root[sizemode="fullscreen"] #navigator-toolbox { position: fixed !important; /* Needed for content to take up entire height */ z-index: 1000 !important; /* Puts the UI above the content */ + + &:is(:hover, :focus-within) { + margin-top: 0 !important; + } } :root[sizemode="fullscreen"] :-moz-any(#navigator-toolbox, #titlebar, #nav-bar, #PersonalToolbar) { From ed5e5198fc44f0bd7051a2091bb85449cc10a276 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 8 Sep 2024 15:36:24 +0900 Subject: [PATCH 21/34] Fix: Fullscreen bookmarkbar visibility #979 --- css/leptonChrome.css | 8 ++++---- css/leptonChromeESR.css | 4 ++-- src/fullscreen/_show_bookmarkbar.scss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 4e8b48f..c66cb1e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9841,8 +9841,8 @@ } } @supports -moz-bool-pref("userChrome.fullscreen.show_bookmarkbar") { - :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized="true"]:not([collapsed="true"]), - :root[sizemode="fullscreen"] #PersonalToolbar[initialized="true"] { + :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]), + :root[sizemode="fullscreen"] #PersonalToolbar[initialized] { visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */ } } @@ -24458,8 +24458,8 @@ } } @media (-moz-bool-pref: "userChrome.fullscreen.show_bookmarkbar") { - :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized="true"]:not([collapsed="true"]), - :root[sizemode="fullscreen"] #PersonalToolbar[initialized="true"] { + :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]), + :root[sizemode="fullscreen"] #PersonalToolbar[initialized] { visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */ } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index de809a1..c335cce 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -10271,8 +10271,8 @@ } } @supports -moz-bool-pref("userChrome.fullscreen.show_bookmarkbar") { - :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized="true"]:not([collapsed="true"]), - :root[sizemode="fullscreen"] #PersonalToolbar[initialized="true"] { + :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]), + :root[sizemode="fullscreen"] #PersonalToolbar[initialized] { visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */ } } diff --git a/src/fullscreen/_show_bookmarkbar.scss b/src/fullscreen/_show_bookmarkbar.scss index a91348e..d787a8d 100644 --- a/src/fullscreen/_show_bookmarkbar.scss +++ b/src/fullscreen/_show_bookmarkbar.scss @@ -1,4 +1,4 @@ -:root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized="true"]:not([collapsed="true"]), -:root[sizemode="fullscreen"] #PersonalToolbar[initialized="true"] { +:root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized]:not([collapsed="true"]), +:root[sizemode="fullscreen"] #PersonalToolbar[initialized] { visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */ } From b3e1b844513eb3c52a32a25dd4e48f00a2d838b2 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 13 Sep 2024 16:12:34 +0900 Subject: [PATCH 22/34] Fix: Icons - Report broken site at Protection popup #971 --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 3 +++ src/icons/_panel.scss | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c66cb1e..5afefdc 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11659,6 +11659,9 @@ fill: currentColor; margin-inline-end: 1em; } + #protections-popup-report-broken-site-button { + list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); + } #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-multiView .panel-subview-footer-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); @@ -26700,6 +26703,11 @@ margin-inline-end: 1em; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #protections-popup-report-broken-site-button { + list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-multiView .panel-subview-footer-button { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index c335cce..ffd5469 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12097,6 +12097,9 @@ fill: currentColor; margin-inline-end: 1em; } + #protections-popup-report-broken-site-button { + list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); + } #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-multiView .panel-subview-footer-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 9240e7b..7c41d90 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -500,6 +500,10 @@ panelMenuBookmarkThisPage[starred] { margin-inline-end: 1em; } +#protections-popup-report-broken-site-button { + list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); +} + #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-multiView .panel-subview-footer-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); From 3b44e58ef45fa2f61d1d6b2494e7fec60ae978fd Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 15 Sep 2024 17:09:00 +0900 Subject: [PATCH 23/34] Fix: Icons - URL view tranding bloacks #964 --- css/leptonChrome.css | 6 ++++++ css/leptonChromeESR.css | 3 +++ src/icons/context_menu/_others.scss | 3 +++ 3 files changed, 12 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5afefdc..9012bba 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13205,6 +13205,9 @@ --menuitem-image: url("../icons/send.svg"); } /*= urlbarView-result-menu ===================================================*/ + .urlbarView-result-menuitem[data-command="trendingblock"] { + --menuitem-image: url("../icons/eye-hide.svg"); + } .urlbarView-result-menuitem[data-command="dismiss"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } @@ -28709,6 +28712,9 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .urlbarView-result-menuitem[data-command="trendingblock"] { + --menuitem-image: url("../icons/eye-hide.svg"); + } .urlbarView-result-menuitem[data-command="dismiss"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index ffd5469..8326813 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13836,6 +13836,9 @@ --menuitem-image: url("../icons/send.svg"); } /*= urlbarView-result-menu ===================================================*/ + .urlbarView-result-menuitem[data-command="trendingblock"] { + --menuitem-image: url("../icons/eye-hide.svg"); + } .urlbarView-result-menuitem[data-command="dismiss"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index b156633..63c5401 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -260,6 +260,9 @@ menuitem.searchbar-clear-history { /*= urlbarView-result-menu ===================================================*/ .urlbarView-result-menuitem { + &[data-command="trendingblock"] { + --menuitem-image: url("../icons/eye-hide.svg"); + } &[data-command="dismiss"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } From 4c78d5cd9d38dba951756fff7939f75184f921ba Mon Sep 17 00:00:00 2001 From: Zap <134786889+zapSNH@users.noreply.github.com> Date: Sun, 1 Sep 2024 11:03:30 +0800 Subject: [PATCH 24/34] Icons for https://github.com/black7375/Firefox-UI-Fix/issues/962 * 1.25px import icon (from Photon) * 1.25px stopwatch icon (from Photon) * 1.25px refresh icon (from Acorn) * 1.25px update circle icon (from Acorn) --- icons/import.svg | 1 + icons/profiler-stopwatch.svg | 1 + icons/refresh-cw.svg | 10 +--------- icons/update-circle.svg | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 icons/import.svg create mode 100644 icons/profiler-stopwatch.svg create mode 100644 icons/update-circle.svg diff --git a/icons/import.svg b/icons/import.svg new file mode 100644 index 0000000..1746970 --- /dev/null +++ b/icons/import.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/profiler-stopwatch.svg b/icons/profiler-stopwatch.svg new file mode 100644 index 0000000..70de076 --- /dev/null +++ b/icons/profiler-stopwatch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/refresh-cw.svg b/icons/refresh-cw.svg index 8d41f1c..15497e5 100644 --- a/icons/refresh-cw.svg +++ b/icons/refresh-cw.svg @@ -1,9 +1 @@ - - - - - - - - - + diff --git a/icons/update-circle.svg b/icons/update-circle.svg new file mode 100644 index 0000000..5a216bd --- /dev/null +++ b/icons/update-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file From 50f76389ade77bca624eff4cd5006e21c7101227 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 16 Sep 2024 18:20:01 +0900 Subject: [PATCH 25/34] Fix: Icons - Send to devices at sync panel #986 --- css/leptonChrome.css | 32 ++++++++++++++++++++++++++++++++ css/leptonChromeESR.css | 15 +++++++++++++++ src/icons/_panel.scss | 22 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 9012bba..674f300 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11453,6 +11453,21 @@ .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]) { list-style-image: url("chrome://global/skin/icons/settings.svg"); } + .sendToDevice-device[clientType="phone"] { + list-style-image: url("../icons/device-phone.svg") !important; + } + .sendToDevice-device[clientType="tablet"] { + list-style-image: url("../icons/device-tablet.svg") !important; + } + .sendToDevice-device[clientType="desktop"] { + list-style-image: url("../icons/device-desktop.svg") !important; + } + .sendToDevice-device[clientType="tv"] { + list-style-image: url("../icons/device-tv.svg") !important; + } + .sendToDevice-device[clientType="vr"] { + list-style-image: url("../icons/device-vr.svg") !important; + } /*= Panel - Bookmark =========================================================*/ #panelMenuBookmarkThisPage { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); @@ -26419,6 +26434,23 @@ list-style-image: url("chrome://global/skin/icons/settings.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + .sendToDevice-device[clientType="phone"] { + list-style-image: url("../icons/device-phone.svg") !important; + } + .sendToDevice-device[clientType="tablet"] { + list-style-image: url("../icons/device-tablet.svg") !important; + } + .sendToDevice-device[clientType="desktop"] { + list-style-image: url("../icons/device-desktop.svg") !important; + } + .sendToDevice-device[clientType="tv"] { + list-style-image: url("../icons/device-tv.svg") !important; + } + .sendToDevice-device[clientType="vr"] { + list-style-image: url("../icons/device-vr.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #panelMenuBookmarkThisPage { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 8326813..fadf4ab 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11891,6 +11891,21 @@ .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]) { list-style-image: url("chrome://global/skin/icons/settings.svg"); } + .sendToDevice-device[clientType="phone"] { + list-style-image: url("../icons/device-phone.svg") !important; + } + .sendToDevice-device[clientType="tablet"] { + list-style-image: url("../icons/device-tablet.svg") !important; + } + .sendToDevice-device[clientType="desktop"] { + list-style-image: url("../icons/device-desktop.svg") !important; + } + .sendToDevice-device[clientType="tv"] { + list-style-image: url("../icons/device-tv.svg") !important; + } + .sendToDevice-device[clientType="vr"] { + list-style-image: url("../icons/device-vr.svg") !important; + } /*= Panel - Bookmark =========================================================*/ #panelMenuBookmarkThisPage { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 7c41d90..f981196 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -274,6 +274,28 @@ list-style-image: url("chrome://global/skin/icons/settings.svg"); } +.sendToDevice-device { + &[clientType="phone"] { + list-style-image: url("../icons/device-phone.svg") !important; + } + + &[clientType="tablet"] { + list-style-image: url("../icons/device-tablet.svg") !important; + } + + &[clientType="desktop"] { + list-style-image: url("../icons/device-desktop.svg") !important; + } + + &[clientType="tv"] { + list-style-image: url("../icons/device-tv.svg") !important; + } + + &[clientType="vr"] { + list-style-image: url("../icons/device-vr.svg") !important; + } +} + /*= Panel - Bookmark =========================================================*/ #panelMenuBookmarkThisPage { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); From 591cade37a909a62c6fe0b1e8f4ddfabceaaca8d Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 17 Sep 2024 22:22:38 +0900 Subject: [PATCH 26/34] Add: Icons - Chatbot menus #978 --- css/leptonChrome.css | 100 ++++++++++++++++++++-- css/leptonChromeESR.css | 44 ++++++++-- icons/apps-list-detail.svg | 3 + icons/arrow-up-exclamation.svg | 3 + icons/code-text.svg | 3 + icons/tetris-app.svg | 3 + src/icons/context_menu/_content_area.scss | 32 +++++++ src/icons/layout/_menu_common.scss | 2 +- 8 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 icons/apps-list-detail.svg create mode 100644 icons/arrow-up-exclamation.svg create mode 100644 icons/code-text.svg create mode 100644 icons/tetris-app.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 674f300..8528b9a 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11806,7 +11806,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -11891,7 +11892,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -11985,7 +11987,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12054,7 +12057,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12803,6 +12807,35 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } } + /*= context-ask-chat =========================================================*/ + #ask-chat-shortcuts .toolbarbutton-icon { + order: -1; + margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important; + } + #ask-chat-shortcuts .subviewbutton:nth-child(1) { + list-style-image: url("../icons/apps-list-detail.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(2) { + list-style-image: url("../icons/code-text.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(3) { + list-style-image: url("../icons/tetris-app.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(4) { + list-style-image: url("../icons/arrow-up-exclamation.svg"); + } + #context-ask-chat menuitem:nth-child(1) { + --menuitem-image: url("../icons/apps-list-detail.svg"); + } + #context-ask-chat menuitem:nth-child(2) { + --menuitem-image: url("../icons/code-text.svg"); + } + #context-ask-chat menuitem:nth-child(3) { + --menuitem-image: url("../icons/tetris-app.svg"); + } + #context-ask-chat menuitem:nth-child(4) { + --menuitem-image: url("../icons/arrow-up-exclamation.svg"); + } /*= main-context-menu-frame ==================================================*/ #context-showonlythisframe { --menuitem-image: url("../icons/eye-show.svg"); @@ -26895,7 +26928,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -26999,7 +27033,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -27092,7 +27127,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -27156,7 +27192,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -27458,6 +27495,7 @@ /*= toolbar-context-menu =====================================================*/ /*= Tab Mix Plus =============================================================*/ /*= contentAreaContextMenu ===================================================*/ + /*= context-ask-chat =========================================================*/ /*= main-context-menu-frame ==================================================*/ /*= Tab Mix Plus =============================================================*/ /*= downloadsContextMenu =====================================================*/ /*= placeContext =============================================================*/ /*= Notification =============================================================*/ @@ -28130,6 +28168,52 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #ask-chat-shortcuts .toolbarbutton-icon { + order: -1; + margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #ask-chat-shortcuts .subviewbutton:nth-child(1) { + list-style-image: url("../icons/apps-list-detail.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #ask-chat-shortcuts .subviewbutton:nth-child(2) { + list-style-image: url("../icons/code-text.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #ask-chat-shortcuts .subviewbutton:nth-child(3) { + list-style-image: url("../icons/tetris-app.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #ask-chat-shortcuts .subviewbutton:nth-child(4) { + list-style-image: url("../icons/arrow-up-exclamation.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-ask-chat menuitem:nth-child(1) { + --menuitem-image: url("../icons/apps-list-detail.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-ask-chat menuitem:nth-child(2) { + --menuitem-image: url("../icons/code-text.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-ask-chat menuitem:nth-child(3) { + --menuitem-image: url("../icons/tetris-app.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-ask-chat menuitem:nth-child(4) { + --menuitem-image: url("../icons/arrow-up-exclamation.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-showonlythisframe { --menuitem-image: url("../icons/eye-show.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index fadf4ab..65b0030 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12244,7 +12244,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12329,7 +12330,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12426,7 +12428,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12502,7 +12505,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -12686,7 +12690,8 @@ #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, #frame > menupopup, - #spell-dictionaries-menu + #spell-dictionaries-menu, + #context-ask-chat > menupopup ) > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, @@ -13434,6 +13439,35 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } } + /*= context-ask-chat =========================================================*/ + #ask-chat-shortcuts .toolbarbutton-icon { + order: -1; + margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important; + } + #ask-chat-shortcuts .subviewbutton:nth-child(1) { + list-style-image: url("../icons/apps-list-detail.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(2) { + list-style-image: url("../icons/code-text.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(3) { + list-style-image: url("../icons/tetris-app.svg"); + } + #ask-chat-shortcuts .subviewbutton:nth-child(4) { + list-style-image: url("../icons/arrow-up-exclamation.svg"); + } + #context-ask-chat menuitem:nth-child(1) { + --menuitem-image: url("../icons/apps-list-detail.svg"); + } + #context-ask-chat menuitem:nth-child(2) { + --menuitem-image: url("../icons/code-text.svg"); + } + #context-ask-chat menuitem:nth-child(3) { + --menuitem-image: url("../icons/tetris-app.svg"); + } + #context-ask-chat menuitem:nth-child(4) { + --menuitem-image: url("../icons/arrow-up-exclamation.svg"); + } /*= main-context-menu-frame ==================================================*/ #context-showonlythisframe { --menuitem-image: url("../icons/eye-show.svg"); diff --git a/icons/apps-list-detail.svg b/icons/apps-list-detail.svg new file mode 100644 index 0000000..39a1bea --- /dev/null +++ b/icons/apps-list-detail.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/arrow-up-exclamation.svg b/icons/arrow-up-exclamation.svg new file mode 100644 index 0000000..e5c57bf --- /dev/null +++ b/icons/arrow-up-exclamation.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/code-text.svg b/icons/code-text.svg new file mode 100644 index 0000000..f55df35 --- /dev/null +++ b/icons/code-text.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/tetris-app.svg b/icons/tetris-app.svg new file mode 100644 index 0000000..ab0ef1b --- /dev/null +++ b/icons/tetris-app.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 5c884cf..06fcdd3 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -292,6 +292,38 @@ } } +/*= context-ask-chat =========================================================*/ +#ask-chat-shortcuts .toolbarbutton-icon { + order: -1; + margin-inline-end: var(--arrowpanel-menuitem-margin-inline) !important; +} +#ask-chat-shortcuts .subviewbutton:nth-child(1) { + list-style-image: url("../icons/apps-list-detail.svg"); +} +#ask-chat-shortcuts .subviewbutton:nth-child(2) { + list-style-image: url("../icons/code-text.svg"); +} +#ask-chat-shortcuts .subviewbutton:nth-child(3) { + list-style-image: url("../icons/tetris-app.svg"); +} +#ask-chat-shortcuts .subviewbutton:nth-child(4) { + list-style-image: url("../icons/arrow-up-exclamation.svg"); +} + + +#context-ask-chat menuitem:nth-child(1) { + --menuitem-image: url("../icons/apps-list-detail.svg"); +} +#context-ask-chat menuitem:nth-child(2) { + --menuitem-image: url("../icons/code-text.svg"); +} +#context-ask-chat menuitem:nth-child(3) { + --menuitem-image: url("../icons/tetris-app.svg"); +} +#context-ask-chat menuitem:nth-child(4) { + --menuitem-image: url("../icons/arrow-up-exclamation.svg"); +} + /*= main-context-menu-frame ==================================================*/ #context-showonlythisframe { --menuitem-image: url("../icons/eye-show.svg"); diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 3885026..ffa5d98 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -31,7 +31,7 @@ $_globalMenus: "#main-menubar > menu"; $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > #{$_iconMenuitem}"; $_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}"; $_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup"; -$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup, #spell-dictionaries-menu) > menuitem#{$_checkMenu}"; +$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup, #spell-dictionaries-menu, #context-ask-chat > menupopup) > menuitem#{$_checkMenu}"; $_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, #sidebarMenu-popup:is(menupopup)"; //-- Mixin --------------------------------------------------------------------- From 113aa41f7dde1f849816be3ffe16f2c1149e114d Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 19 Sep 2024 00:20:09 +0900 Subject: [PATCH 27/34] Fix: Icons - Waterfox open All as Tree menu #987 --- css/leptonChrome.css | 6 ++++++ css/leptonChromeESR.css | 3 +++ icons/organization-horizontal.svg | 3 +++ src/icons/fork_browsers/_waterfox.scss | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 icons/organization-horizontal.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8528b9a..ac8f9a8 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13699,6 +13699,9 @@ menuitem.privatetab-icon { --menuitem-image: url("../icons/private-favicon.svg"); } + #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure { + --menuitem-image: url("../icons/organization-horizontal.svg"); + } } /*= Tor Browser ==============================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { @@ -29454,6 +29457,9 @@ menuitem.privatetab-icon { --menuitem-image: url("../icons/private-favicon.svg"); } + #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure { + --menuitem-image: url("../icons/organization-horizontal.svg"); + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenuNewIdentity { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 65b0030..13e7f49 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -14331,6 +14331,9 @@ menuitem.privatetab-icon { --menuitem-image: url("../icons/private-favicon.svg"); } + #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure { + --menuitem-image: url("../icons/organization-horizontal.svg"); + } } /*= Tor Browser ==============================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { diff --git a/icons/organization-horizontal.svg b/icons/organization-horizontal.svg new file mode 100644 index 0000000..73a2630 --- /dev/null +++ b/icons/organization-horizontal.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/fork_browsers/_waterfox.scss b/src/icons/fork_browsers/_waterfox.scss index 95164e0..3d53d71 100644 --- a/src/icons/fork_browsers/_waterfox.scss +++ b/src/icons/fork_browsers/_waterfox.scss @@ -15,4 +15,8 @@ menuitem.privatetab-icon { --menuitem-image: url("../icons/private-favicon.svg"); } + + #sidebar_waterfox_net-menuitem-_openAllBookmarksWithStructure { + --menuitem-image: url("../icons/organization-horizontal.svg"); + } } From ed8bbe969c7385347428006fff38b3845769449f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 20 Sep 2024 01:06:29 +0900 Subject: [PATCH 28/34] Fix: Activity Stream - 3 dot button size #913 --- css/leptonContent.css | 6 ++++++ css/leptonContentESR.css | 3 +++ src/contents/_activity_stream.scss | 3 +++ 3 files changed, 12 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 447fca7..87defb7 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -374,6 +374,9 @@ } .top-site-outer .context-menu-button { top: 0px !important; /* Original: -20px */ + right: 0px !important; + width: 22px !important; + height: 22px !important; } .top-site-outer .context-menu { top: 16.75px !important; /* Original: 6.75px */ @@ -4094,6 +4097,9 @@ } .top-site-outer .context-menu-button { top: 0px !important; /* Original: -20px */ + right: 0px !important; + width: 22px !important; + height: 22px !important; } .top-site-outer .context-menu { top: 16.75px !important; /* Original: 6.75px */ diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index be8a15b..27ce77b 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -374,6 +374,9 @@ } .top-site-outer .context-menu-button { top: 0px !important; /* Original: -20px */ + right: 0px !important; + width: 22px !important; + height: 22px !important; } .top-site-outer .context-menu { top: 16.75px !important; /* Original: 6.75px */ diff --git a/src/contents/_activity_stream.scss b/src/contents/_activity_stream.scss index 221d1cc..3d8542f 100644 --- a/src/contents/_activity_stream.scss +++ b/src/contents/_activity_stream.scss @@ -51,6 +51,9 @@ .context-menu-button { top: 0px !important; /* Original: -20px */ + right: 0px !important; + width: 22px !important; + height: 22px !important; } .context-menu { top: 16.75px !important; /* Original: 6.75px */ From e34cf5f0863a5628435e6728b8d286470b0a6317 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 22 Sep 2024 17:27:49 +0900 Subject: [PATCH 29/34] Fix: Infobar - Primary button color --- css/leptonChrome.css | 20 ++++++++++++++++++++ css/leptonChromeESR.css | 9 +++++++++ src/theme/_fully_color.scss | 10 ++++++++++ 3 files changed, 39 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index ac8f9a8..890c0e5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1996,6 +1996,15 @@ .notification-button:hover:active { background-color: var(--button-active-bgcolor) !important; } + .notification-button.primary { + background-color: var(--button-primary-bgcolor) !important; + } + .notification-button.primary:hover { + background-color: var(--button-primary-hover-bgcolor) !important; + } + .notification-button.primary:hover:active { + background-color: var(--button-primary-active-bgcolor) !important; + } html|button.ghost-button:not(.semi-transparent):enabled:hover { background-color: var(--button-hover-bgcolor) !important; } @@ -15843,6 +15852,17 @@ background-color: var(--button-active-bgcolor) !important; } } +@media (-moz-bool-pref: "userChrome.theme.fully_color") { + .notification-button.primary { + background-color: var(--button-primary-bgcolor) !important; + } + .notification-button.primary:hover { + background-color: var(--button-primary-hover-bgcolor) !important; + } + .notification-button.primary:hover:active { + background-color: var(--button-primary-active-bgcolor) !important; + } +} @media (-moz-bool-pref: "userChrome.theme.fully_color") { html|button.ghost-button:not(.semi-transparent):enabled:hover { background-color: var(--button-hover-bgcolor) !important; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 13e7f49..d6c45a1 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -2223,6 +2223,15 @@ .notification-button:hover:active { background-color: var(--button-active-bgcolor) !important; } + .notification-button.primary { + background-color: var(--button-primary-bgcolor) !important; + } + .notification-button.primary:hover { + background-color: var(--button-primary-hover-bgcolor) !important; + } + .notification-button.primary:hover:active { + background-color: var(--button-primary-active-bgcolor) !important; + } html|button.ghost-button:not(.semi-transparent):enabled:hover { background-color: var(--button-hover-bgcolor) !important; } diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 54e5449..6f841eb 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -134,6 +134,16 @@ html#main-window menupopup:not(.in-menulist) { background-color: var(--button-active-bgcolor) !important; } } +.notification-button.primary { + background-color: var(--button-primary-bgcolor) !important; + + &:hover { + background-color: var(--button-primary-hover-bgcolor) !important; + } + &:hover:active { + background-color: var(--button-primary-active-bgcolor) !important; + } +} html|button.ghost-button:not(.semi-transparent):enabled:hover { background-color: var(--button-hover-bgcolor) !important; From 93db8584c03872b52655b8a040da376d8fd2ec96 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Sep 2024 18:09:42 +0900 Subject: [PATCH 30/34] Fix: Library - Colflict to bookmark panel selector #988 --- css/leptonChrome.css | 8 ++++---- css/leptonChromeESR.css | 4 ++-- src/theme/_fully_color.scss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 890c0e5..de754de 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2041,8 +2041,8 @@ #editBMPanel_tagsSelector > richlistitem[selected="true"] { background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important; } - #editBMPanel_namePicker, - #editBMPanel_tagsField { + #editBookmarkPanel #editBMPanel_namePicker, + #editBookmarkPanel #editBMPanel_tagsField { --input-bgcolor: var(--arrowpanel-background, Field); --input-color: var(--arrowpanel-color, FieldText); } @@ -15909,8 +15909,8 @@ } } @media (-moz-bool-pref: "userChrome.theme.fully_color") { - #editBMPanel_namePicker, - #editBMPanel_tagsField { + #editBookmarkPanel #editBMPanel_namePicker, + #editBookmarkPanel #editBMPanel_tagsField { --input-bgcolor: var(--arrowpanel-background, Field); --input-color: var(--arrowpanel-color, FieldText); } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index d6c45a1..284a4ed 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -2268,8 +2268,8 @@ #editBMPanel_tagsSelector > richlistitem[selected="true"] { background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important; } - #editBMPanel_namePicker, - #editBMPanel_tagsField { + #editBookmarkPanel #editBMPanel_namePicker, + #editBookmarkPanel #editBMPanel_tagsField { --input-bgcolor: var(--arrowpanel-background, Field); --input-color: var(--arrowpanel-color, FieldText); } diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 6f841eb..799faf1 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -187,8 +187,8 @@ html|button.ghost-button:not(.semi-transparent):enabled:hover:active { background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important; } -#editBMPanel_namePicker, -#editBMPanel_tagsField { +#editBookmarkPanel #editBMPanel_namePicker, +#editBookmarkPanel #editBMPanel_tagsField { --input-bgcolor: var(--arrowpanel-background, Field); --input-color: var(--arrowpanel-color, FieldText); } From f7718ed326857ccf2524e28aa127c61e539821d8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Sep 2024 19:00:36 +0900 Subject: [PATCH 31/34] Fix: about:process profile button hover again #989 --- css/leptonContent.css | 16 ++++++++++++++-- css/leptonContentESR.css | 8 +++++++- .../proton_contents/_about_processes.scss | 11 ++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 87defb7..49e5e9b 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2266,7 +2266,7 @@ } } /*= about:processes ==========================================================*/ - @-moz-document url-prefix("about:processes") { + @-moz-document url-prefix("about:processes"), url-prefix("about:performance") { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { background-image: url("../icons/link.svg") !important; @@ -2281,6 +2281,12 @@ border-radius: 8px !important; } } + .profiler-icon:hover { + color: var(--in-content-button-text-color-hover) !important; + } + .profiler-icon:hover:active { + color: var(--in-content-button-text-color-active) !important; + } } @-moz-document url-prefix("about:profiling") { .perf-intro-icon { @@ -6010,7 +6016,7 @@ } } @media (-moz-bool-pref: "userContent.page.proton") { - @-moz-document url-prefix("about:processes") { + @-moz-document url-prefix("about:processes"), url-prefix("about:performance") { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { background-image: url("../icons/link.svg") !important; @@ -6025,6 +6031,12 @@ border-radius: 8px !important; } } + .profiler-icon:hover { + color: var(--in-content-button-text-color-hover) !important; + } + .profiler-icon:hover:active { + color: var(--in-content-button-text-color-active) !important; + } } } @media (-moz-bool-pref: "userContent.page.proton") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 27ce77b..b984d3a 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2269,7 +2269,7 @@ } } /*= about:processes ==========================================================*/ - @-moz-document url-prefix("about:processes") { + @-moz-document url-prefix("about:processes"), url-prefix("about:performance") { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { background-image: url("../icons/link.svg") !important; @@ -2284,6 +2284,12 @@ border-radius: 8px !important; } } + .profiler-icon:hover { + color: var(--in-content-button-text-color-hover) !important; + } + .profiler-icon:hover:active { + color: var(--in-content-button-text-color-active) !important; + } } @-moz-document url-prefix("about:profiling") { .perf-intro-icon { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index d1167e8..b114de2 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -1,4 +1,7 @@ -@include moz-document(url-prefix "about:processes") { +@include moz-document( + url-prefix "about:processes", + url-prefix "about:performance" +) { td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { background-image: url("../icons/link.svg") !important; } @@ -12,6 +15,12 @@ // #960 color: inherit !important; + &:hover { + color: var(--in-content-button-text-color-hover) !important; + } + &:hover:active { + color: var(--in-content-button-text-color-active) !important; + } } } From 0277495c0ec343d43a6c94c9d2677dcf96b6cf5b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Sep 2024 19:33:52 +0900 Subject: [PATCH 32/34] Fix: Contents - icon scope rule #938 --- css/leptonContent.css | 4 ++-- css/leptonContentESR.css | 2 +- src/contents/_context_menu.scss | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 49e5e9b..f8d133a 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -3292,7 +3292,7 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$") { :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); @@ -7130,7 +7130,7 @@ } /** Menu - Icons Layout *******************************************************/ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { - @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$") { :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index b984d3a..847673e 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -3295,7 +3295,7 @@ /** Menu - Icons Layout *******************************************************/ @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports -moz-bool-pref("userChrome.icon.menu") { - @-moz-document url-prefix("about:"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$") { :root { --uc-folder-icon: url("chrome://global/skin/icons/folder.svg"); diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss index c505af7..c4a2e7e 100644 --- a/src/contents/_context_menu.scss +++ b/src/contents/_context_menu.scss @@ -2,7 +2,8 @@ @include moz-document( url-prefix "about:", - regexp "^(((jar:)?file:\/\/\/)|(chrome:\/\/)).*\/$" + url-prefix "chrome://", + regexp "^((jar:)?file:\/\/\/).*\/$" ) { :root { @include initIcons; From df6bc8d430bad97371f3b8cf606bb9288d2a6a1c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Sep 2024 20:15:43 +0900 Subject: [PATCH 33/34] Fix: Content - `about:process` profile icon hover #960 --- css/leptonContent.css | 12 ------------ css/leptonContentESR.css | 6 ------ src/contents/proton_contents/_about_processes.scss | 6 ------ 3 files changed, 24 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index f8d133a..6f3c5c6 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2281,12 +2281,6 @@ border-radius: 8px !important; } } - .profiler-icon:hover { - color: var(--in-content-button-text-color-hover) !important; - } - .profiler-icon:hover:active { - color: var(--in-content-button-text-color-active) !important; - } } @-moz-document url-prefix("about:profiling") { .perf-intro-icon { @@ -6031,12 +6025,6 @@ border-radius: 8px !important; } } - .profiler-icon:hover { - color: var(--in-content-button-text-color-hover) !important; - } - .profiler-icon:hover:active { - color: var(--in-content-button-text-color-active) !important; - } } } @media (-moz-bool-pref: "userContent.page.proton") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 847673e..7044aa9 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2284,12 +2284,6 @@ border-radius: 8px !important; } } - .profiler-icon:hover { - color: var(--in-content-button-text-color-hover) !important; - } - .profiler-icon:hover:active { - color: var(--in-content-button-text-color-active) !important; - } } @-moz-document url-prefix("about:profiling") { .perf-intro-icon { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index b114de2..7a823ab 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -15,12 +15,6 @@ // #960 color: inherit !important; - &:hover { - color: var(--in-content-button-text-color-hover) !important; - } - &:hover:active { - color: var(--in-content-button-text-color-active) !important; - } } } From c327fb7fe04949990993f6deb218d144e6b364c4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Sep 2024 20:36:53 +0900 Subject: [PATCH 34/34] Fix: Content - `about:process` thin icon #960 --- css/leptonContent.css | 8 ++++++-- css/leptonContentESR.css | 4 +++- src/contents/proton_contents/_about_processes.scss | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 6f3c5c6..ee807bb 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2273,7 +2273,9 @@ } .profiler-icon { cursor: pointer; - background-image: url("../icons/performance.svg") no-repeat center !important; + background-image: url("../icons/performance.svg") !important; + background-repeat: no-repeat !important; + background-position: center !important; color: inherit !important; } @supports not -moz-bool-pref("userChrome.rounding.square_button") { @@ -6017,7 +6019,9 @@ } .profiler-icon { cursor: pointer; - background-image: url("../icons/performance.svg") no-repeat center !important; + background-image: url("../icons/performance.svg") !important; + background-repeat: no-repeat !important; + background-position: center !important; color: inherit !important; } @media (-moz-bool-pref: "userContent.page.proton") and (not (-moz-bool-pref: "userChrome.rounding.square_button")) { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 7044aa9..a0def8e 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -2276,7 +2276,9 @@ } .profiler-icon { cursor: pointer; - background-image: url("../icons/performance.svg") no-repeat center !important; + background-image: url("../icons/performance.svg") !important; + background-repeat: no-repeat !important; + background-position: center !important; color: inherit !important; } @supports not -moz-bool-pref("userChrome.rounding.square_button") { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss index 7a823ab..5a05cdc 100644 --- a/src/contents/proton_contents/_about_processes.scss +++ b/src/contents/proton_contents/_about_processes.scss @@ -8,7 +8,9 @@ .profiler-icon { cursor: pointer; - background-image: url("../icons/performance.svg") no-repeat center !important; + background-image: url("../icons/performance.svg") !important; + background-repeat: no-repeat !important; + background-position: center !important; @include NotOption("userChrome.rounding.square_button") { border-radius: 8px !important; }