From 8c6140ce20b85d6a7292980b0408b75731f2ec5e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 24 Nov 2023 12:30:55 +0900 Subject: [PATCH 01/17] Doc: CREDITS - Update to sponsors --- CREDITS | 11 +++++++++++ README.org | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/CREDITS b/CREDITS index 3c6219af..0c3155a0 100644 --- a/CREDITS +++ b/CREDITS @@ -28,9 +28,15 @@ W: https://github.com/zapSNH ---------- Sponsors +N: Private sponsors - 3 + N: Alessandro Rubino W: https://github.com/Babbiorsetto +N: Alex Besogonov +E: Alex.Besogonov@gmail.com +W: Alex.Besogonov@gmail.com + N: Jani Haiko E: haiko.jani@gmail.com W: https://github.com/ojaha065 @@ -42,6 +48,9 @@ W: https://github.com/DPS0340 N: kanlukasz W: https://github.com/kanlukasz +N: Mike-Kennelly +W: https://github.com/Mike-Kennelly + N: nikkehtine E: nikkehtine@int.pl W: https://github.com/nikkehtine @@ -49,6 +58,8 @@ W: https://github.com/nikkehtine N: OSS.kr W: https://www.oss.kr/ +N: Safira + N: ZachKnife1 W: https://github.com/ZachKnife1 diff --git a/README.org b/README.org index b4cfde31..1957d77b 100644 --- a/README.org +++ b/README.org @@ -206,6 +206,11 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[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:@@]] + +- A donation was received from Safira on [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Ko-Fi]] +- Private sponsors: 3 *Contributors* From a3c45581427af8cc29b2d3561ae63cb5e1a33707 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 25 Nov 2023 18:51:31 +0900 Subject: [PATCH 02/17] Fix: Tab - Selected background at FF v121 #827 https://github.com/mozilla/gecko-dev/commit/4ac6245eb928327070710d2966abb6344a240dd2 --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 4 ++++ src/tab/selected_tab/_color_like_toolbar.scss | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 14b3ccba..e07b369f 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6694,6 +6694,10 @@ --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */ --tab-selected-bgimage: unset !important; /* Above FF v101 */ } + #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon, + .tab-background:is([selected], [multiselected]) { + background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important; + } #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab @@ -20505,6 +20509,10 @@ --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */ --tab-selected-bgimage: unset !important; /* Above FF v101 */ } + #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon, + .tab-background:is([selected], [multiselected]) { + background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important; + } #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 07fe5ce3..f300f2de 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7103,6 +7103,10 @@ --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */ --tab-selected-bgimage: unset !important; /* Above FF v101 */ } + #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon, + .tab-background:is([selected], [multiselected]) { + background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important; + } #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab diff --git a/src/tab/selected_tab/_color_like_toolbar.scss b/src/tab/selected_tab/_color_like_toolbar.scss index 48b673ec..5e3e3232 100644 --- a/src/tab/selected_tab/_color_like_toolbar.scss +++ b/src/tab/selected_tab/_color_like_toolbar.scss @@ -3,6 +3,10 @@ --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */ --tab-selected-bgimage: unset !important; /* Above FF v101 */ } +#TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon, .tab-background:is([selected], [multiselected]) { + background-color: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) !important; +} + #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab From 359c848fd908e93765e351f4f4272c5cb0633fde Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 25 Nov 2023 19:03:36 +0900 Subject: [PATCH 03/17] Fix: Theme - Titlebar color compatibility #828 Various properties are added to the root window. https://github.com/mozilla/gecko-dev/commit/d8e189e0a09b983074d2be2e62117d74aa5ea11a#diff-22a07dabde94c5c17c1432ec98972c91596871108945f61a932facb0f3e510f5 --- css/leptonChrome.css | 4 ++-- css/leptonChromeESR.css | 2 +- src/theme/_fully_color.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e07b369f..294e5d63 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1945,7 +1945,7 @@ --input-color: var(--arrowpanel-color, FieldText); } /*== Sidebar - Field Color ===================================================*/ - html[lwt-sidebar] body { + html[lwt-sidebar]:not(#main-window) body { background-color: var(--lwt-sidebar-background-color, Field) !important; color: var(--lwt-sidebar-text-color, FieldText) !important; } @@ -15210,7 +15210,7 @@ } } @media (-moz-bool-pref: "userChrome.theme.fully_color") { - html[lwt-sidebar] body { + html[lwt-sidebar]:not(#main-window) body { background-color: var(--lwt-sidebar-background-color, Field) !important; color: var(--lwt-sidebar-text-color, FieldText) !important; } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f300f2de..9e0e4f48 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -2169,7 +2169,7 @@ --input-color: var(--arrowpanel-color, FieldText); } /*== Sidebar - Field Color ===================================================*/ - html[lwt-sidebar] body { + html[lwt-sidebar]:not(#main-window) body { background-color: var(--lwt-sidebar-background-color, Field) !important; color: var(--lwt-sidebar-text-color, FieldText) !important; } diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 503bd828..7be2d911 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -182,7 +182,7 @@ html|button.ghost-button:not(.semi-transparent):enabled:hover:active { } /*== Sidebar - Field Color ===================================================*/ -html[lwt-sidebar] body { +html[lwt-sidebar]:not(#main-window) body { background-color: var(--lwt-sidebar-background-color, Field) !important; color: var(--lwt-sidebar-text-color, FieldText) !important; } From b02aad0265947231801206c6332e9651baa6cb7e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 26 Nov 2023 20:54:24 +0900 Subject: [PATCH 04/17] Add: Tab - `userChrome.tab.blue_accent #811` --- css/leptonChrome.css | 46 ++++++++++++++++++++------------------ css/leptonChromeESR.css | 23 ++++++++++--------- src/tab/_selected_tab.scss | 19 +++++++++------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 294e5d63..8049ffa9 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7193,18 +7193,21 @@ @supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.static_separator") or -moz-bool-pref( "userChrome.tab.bar_separator" ) { - :root[lwtheme-mozlightdark] #tabbrowser-tabs, - :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], - :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --tab-line-color: rgb(10, 132, 255) !important; - } - @media (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: AccentColor !important; /* -moz-accent-color */ + @supports -moz-bool-pref("userChrome.tab.blue_accent") { + :root, + #tabbrowser-tabs { + --tab-line-color: rgb(10, 132, 255) !important; } - @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + } + @supports not -moz-bool-pref("userChrome.tab.blue_accent") { + @media (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: Highlight !important; /* -moz-accent-color */ + --tab-line-color: AccentColor !important; /* -moz-accent-color */ + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { + --tab-line-color: Highlight !important; /* -moz-accent-color */ + } } } } @@ -21118,25 +21121,24 @@ } } /*= Selected Tab - Photon like contextline ===================================*/ -@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline"), - (-moz-bool-pref: "userChrome.tab.static_separator"), - (-moz-bool-pref: "userChrome.tab.bar_separator") { - :root[lwtheme-mozlightdark] #tabbrowser-tabs, - :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], - :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { +@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (-moz-bool-pref: "userChrome.tab.blue_accent"), + (-moz-bool-pref: "userChrome.tab.static_separator") and (-moz-bool-pref: "userChrome.tab.blue_accent"), + (-moz-bool-pref: "userChrome.tab.bar_separator") and (-moz-bool-pref: "userChrome.tab.blue_accent") { + :root, + #tabbrowser-tabs { --tab-line-color: rgb(10, 132, 255) !important; } } -@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (-moz-gtk-csd-available), - (-moz-bool-pref: "userChrome.tab.static_separator") and (-moz-gtk-csd-available), - (-moz-bool-pref: "userChrome.tab.bar_separator") and (-moz-gtk-csd-available) { +@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available), + (-moz-bool-pref: "userChrome.tab.static_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available), + (-moz-bool-pref: "userChrome.tab.bar_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) #tabbrowser-tabs { --tab-line-color: AccentColor !important; /* -moz-accent-color */ } } -@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"), - (-moz-bool-pref: "userChrome.tab.static_separator") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"), - (-moz-bool-pref: "userChrome.tab.bar_separator") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") { +@media (-moz-bool-pref: "userChrome.tab.photon_like_contextline") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"), + (-moz-bool-pref: "userChrome.tab.static_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color"), + (-moz-bool-pref: "userChrome.tab.bar_separator") and (not (-moz-bool-pref: "userChrome.tab.blue_accent")) and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") { :root:not(:-moz-lwtheme) #tabbrowser-tabs { --tab-line-color: Highlight !important; /* -moz-accent-color */ } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 9e0e4f48..57cda846 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -7602,18 +7602,21 @@ @supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.static_separator") or -moz-bool-pref( "userChrome.tab.bar_separator" ) { - :root[lwtheme-mozlightdark] #tabbrowser-tabs, - :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], - :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --tab-line-color: rgb(10, 132, 255) !important; - } - @media (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: AccentColor !important; /* -moz-accent-color */ + @supports -moz-bool-pref("userChrome.tab.blue_accent") { + :root, + #tabbrowser-tabs { + --tab-line-color: rgb(10, 132, 255) !important; } - @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + } + @supports not -moz-bool-pref("userChrome.tab.blue_accent") { + @media (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: Highlight !important; /* -moz-accent-color */ + --tab-line-color: AccentColor !important; /* -moz-accent-color */ + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { + --tab-line-color: Highlight !important; /* -moz-accent-color */ + } } } } diff --git a/src/tab/_selected_tab.scss b/src/tab/_selected_tab.scss index 4cbdd848..aeb05322 100644 --- a/src/tab/_selected_tab.scss +++ b/src/tab/_selected_tab.scss @@ -45,15 +45,18 @@ "userChrome.tab.photon_like_contextline", "userChrome.tab.static_separator", "userChrome.tab.bar_separator") { - :root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */ - :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], - :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --tab-line-color: rgb(10, 132, 255) !important; + @include Option("userChrome.tab.blue_accent") { + :root, + #tabbrowser-tabs { + --tab-line-color: rgb(10, 132, 255) !important; + } } - @include OS("linux") { - :root:not(:-moz-lwtheme) #tabbrowser-tabs { - @include AccentColor("Highlight") { - --tab-line-color: #{$accentColor} !important; /* -moz-accent-color */ + @include NotOption("userChrome.tab.blue_accent") { + @include OS("linux") { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { + @include AccentColor("Highlight") { + --tab-line-color: #{$accentColor} !important; /* -moz-accent-color */ + } } } } From 203b1f316d60445d4a805c6cedacd5e13bcfb94a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 2 Dec 2023 13:17:02 +0900 Subject: [PATCH 05/17] Add: Icons - Missing icons for upstream #833 --- css/leptonChrome.css | 62 +++++++++++++++-------- css/leptonChromeESR.css | 29 +++++++---- icons/relay-logo.svg | 6 +++ src/icons/_panel.scss | 1 + src/icons/context_menu/_content_area.scss | 30 +++++++---- 5 files changed, 86 insertions(+), 42 deletions(-) create mode 100644 icons/relay-logo.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8049ffa9..158af24d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11203,6 +11203,7 @@ #appMenu_troubleShooting { list-style-image: url("chrome://global/skin/icons/more.svg"); } + #appMenu-report-broken-site-button, #appMenu_help_reportSiteIssue { list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); } @@ -12112,9 +12113,7 @@ #context-openlinkincurrent { --menuitem-image: url("../icons/link-square.svg"); } - #context-openlinkincontainertab { - --menuitem-image: var(--uc-new-tab-icon); - } + #context-openlinkincontainertab, #context-openlinkintab { --menuitem-image: var(--uc-new-tab-icon); } @@ -12250,30 +12249,40 @@ #fill-login-generated-password { --menuitem-image: url("chrome://browser/skin/login.svg"); } + #use-relay-mask { + --menuitem-image: url("../icons/relay-logo.svg"); + } #manage-saved-logins { --menuitem-image: url("../icons/key-multiple.svg"); } - #context-undo { + #context-undo, + #context-pdfjs-undo { --menuitem-image: url("../icons/undo.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { - #context-redo { + #context-redo, + #context-pdfjs-redo { --menuitem-image: url("../icons/redo.svg"); } } - #context-cut { + #context-cut, + #context-pdfjs-cut { --menuitem-image: url("../icons/edit-cut.svg"); } - #context-copy { + #context-copy, + #context-pdfjs-copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #context-paste { + #context-paste, + #context-pdfjs-paste { --menuitem-image: url("../icons/edit-paste.svg"); } - #context-delete { + #context-delete, + #context-pdfjs-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #context-selectall { + #context-selectall, + #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } #context-reveal-password { @@ -25665,6 +25674,7 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #appMenu-report-broken-site-button, #appMenu_help_reportSiteIssue { list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); } @@ -26724,11 +26734,7 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { - #context-openlinkincontainertab { - --menuitem-image: var(--uc-new-tab-icon); - } -} -@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-openlinkincontainertab, #context-openlinkintab { --menuitem-image: var(--uc-new-tab-icon); } @@ -26949,43 +26955,55 @@ --menuitem-image: url("chrome://browser/skin/login.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #use-relay-mask { + --menuitem-image: url("../icons/relay-logo.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #manage-saved-logins { --menuitem-image: url("../icons/key-multiple.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-undo { + #context-undo, + #context-pdfjs-undo { --menuitem-image: url("../icons/undo.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { - #context-redo { + #context-redo, + #context-pdfjs-redo { --menuitem-image: url("../icons/redo.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-cut { + #context-cut, + #context-pdfjs-cut { --menuitem-image: url("../icons/edit-cut.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-copy { + #context-copy, + #context-pdfjs-copy { --menuitem-image: url("../icons/edit-copy.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-paste { + #context-paste, + #context-pdfjs-paste { --menuitem-image: url("../icons/edit-paste.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-delete { + #context-delete, + #context-pdfjs-delete { --menuitem-image: url("chrome://global/skin/icons/delete.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-selectall { + #context-selectall, + #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 57cda846..d2324d83 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -11620,6 +11620,7 @@ #appMenu_troubleShooting { list-style-image: url("chrome://global/skin/icons/more.svg"); } + #appMenu-report-broken-site-button, #appMenu_help_reportSiteIssue { list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); } @@ -12721,9 +12722,7 @@ #context-openlinkincurrent { --menuitem-image: url("../icons/link-square.svg"); } - #context-openlinkincontainertab { - --menuitem-image: var(--uc-new-tab-icon); - } + #context-openlinkincontainertab, #context-openlinkintab { --menuitem-image: var(--uc-new-tab-icon); } @@ -12859,30 +12858,40 @@ #fill-login-generated-password { --menuitem-image: url("chrome://browser/skin/login.svg"); } + #use-relay-mask { + --menuitem-image: url("../icons/relay-logo.svg"); + } #manage-saved-logins { --menuitem-image: url("../icons/key-multiple.svg"); } - #context-undo { + #context-undo, + #context-pdfjs-undo { --menuitem-image: url("../icons/undo.svg"); } @supports -moz-bool-pref("userChrome.icon.menu.full") { - #context-redo { + #context-redo, + #context-pdfjs-redo { --menuitem-image: url("../icons/redo.svg"); } } - #context-cut { + #context-cut, + #context-pdfjs-cut { --menuitem-image: url("../icons/edit-cut.svg"); } - #context-copy { + #context-copy, + #context-pdfjs-copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #context-paste { + #context-paste, + #context-pdfjs-paste { --menuitem-image: url("../icons/edit-paste.svg"); } - #context-delete { + #context-delete, + #context-pdfjs-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #context-selectall { + #context-selectall, + #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } #context-reveal-password { diff --git a/icons/relay-logo.svg b/icons/relay-logo.svg new file mode 100644 index 00000000..b3ee0aae --- /dev/null +++ b/icons/relay-logo.svg @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index f48eae2d..2b0a8594 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -379,6 +379,7 @@ panelMenuBookmarkThisPage[starred] { #appMenu_troubleShooting { list-style-image: url("chrome://global/skin/icons/more.svg"); } +#appMenu-report-broken-site-button, #appMenu_help_reportSiteIssue { list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index f3b34406..e10c0a62 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -25,9 +25,7 @@ #context-openlinkincurrent { --menuitem-image: url("../icons/link-square.svg"); } -#context-openlinkincontainertab { - --menuitem-image: var(--uc-new-tab-icon); -} +#context-openlinkincontainertab, #context-openlinkintab { --menuitem-image: var(--uc-new-tab-icon); } @@ -168,32 +166,44 @@ #fill-login-generated-password { --menuitem-image: url("chrome://browser/skin/login.svg"); } +#use-relay-mask { + --menuitem-image: url("../icons/relay-logo.svg"); +} #manage-saved-logins { --menuitem-image: url("../icons/key-multiple.svg"); } -#context-undo { +#context-undo, +#context-pdfjs-undo { --menuitem-image: url("../icons/undo.svg"); } -#context-redo { +#context-redo, +#context-pdfjs-redo { @include Option("userChrome.icon.menu.full") { --menuitem-image: url("../icons/redo.svg"); } } -#context-cut { +#context-cut, +#context-pdfjs-cut { --menuitem-image: url("../icons/edit-cut.svg"); } -#context-copy { +#context-copy, +#context-pdfjs-copy { --menuitem-image: url("../icons/edit-copy.svg"); } -#context-paste { +#context-paste, +#context-pdfjs-paste { --menuitem-image: url("../icons/edit-paste.svg"); } -#context-delete { +#context-paste-no-formatting { +} +#context-delete, +#context-pdfjs-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } -#context-selectall { +#context-selectall, +#context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } #context-reveal-password { From 0b881eafdac8ede4b51f776499e8e85014289d10 Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Sun, 19 Nov 2023 13:30:06 +0800 Subject: [PATCH 06/17] Add square PWA Icons --- icons/pwa-install.svg | 1 + icons/pwa-launch.svg | 1 + icons/pwa-manage.svg | 1 + icons/pwa-remove.svg | 1 + 4 files changed, 4 insertions(+) create mode 100644 icons/pwa-install.svg create mode 100644 icons/pwa-launch.svg create mode 100644 icons/pwa-manage.svg create mode 100644 icons/pwa-remove.svg diff --git a/icons/pwa-install.svg b/icons/pwa-install.svg new file mode 100644 index 00000000..2a336e9a --- /dev/null +++ b/icons/pwa-install.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/pwa-launch.svg b/icons/pwa-launch.svg new file mode 100644 index 00000000..8f27a372 --- /dev/null +++ b/icons/pwa-launch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/pwa-manage.svg b/icons/pwa-manage.svg new file mode 100644 index 00000000..10afac19 --- /dev/null +++ b/icons/pwa-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/pwa-remove.svg b/icons/pwa-remove.svg new file mode 100644 index 00000000..449227f2 --- /dev/null +++ b/icons/pwa-remove.svg @@ -0,0 +1 @@ + \ No newline at end of file From 9c4cbe01cda20d51a0b863a7373a36ca4d35e97c Mon Sep 17 00:00:00 2001 From: ZapSNH <134786889+zapSNH@users.noreply.github.com> Date: Sun, 19 Nov 2023 16:30:17 +0800 Subject: [PATCH 07/17] Change square PWA icons to monitor icons --- icons/pwa-install.svg | 2 +- icons/pwa-launch.svg | 2 +- icons/pwa-manage.svg | 2 +- icons/pwa-remove.svg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/icons/pwa-install.svg b/icons/pwa-install.svg index 2a336e9a..37d05c18 100644 --- a/icons/pwa-install.svg +++ b/icons/pwa-install.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/pwa-launch.svg b/icons/pwa-launch.svg index 8f27a372..e7662e13 100644 --- a/icons/pwa-launch.svg +++ b/icons/pwa-launch.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/pwa-manage.svg b/icons/pwa-manage.svg index 10afac19..5bed6199 100644 --- a/icons/pwa-manage.svg +++ b/icons/pwa-manage.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icons/pwa-remove.svg b/icons/pwa-remove.svg index 449227f2..3362b74e 100644 --- a/icons/pwa-remove.svg +++ b/icons/pwa-remove.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 08079e8989d9c11dc2ccae410578dc5c9dd4e22a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 2 Dec 2023 13:52:00 +0900 Subject: [PATCH 08/17] Add: Icons - Floorp browser progressive web apps #819 Co-authored-by: Ryosuke Asano --- css/leptonChrome.css | 32 ++++++++++++++++++++++++++++ css/leptonChromeESR.css | 15 +++++++++++++ src/icons/fork_browsers/_floorp.scss | 23 ++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 158af24d..0e9f855e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13175,6 +13175,12 @@ } } /*= Floorp Browser ===========================================================*/ + #ssbPageAction-image { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -13182,6 +13188,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } } @supports -moz-bool-pref("userChrome.icon.menu") { #toggle_sharemode { @@ -28273,6 +28288,14 @@ --menuitem-image: url("chrome://browser/skin/onion.svg"); } } +@media not (-moz-bool-pref: "userChrome.icon.disabled") { + #ssbPageAction-image { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -28280,6 +28303,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { #toggle_sharemode { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index d2324d83..f5c88fac 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13784,6 +13784,12 @@ } } /*= Floorp Browser ===========================================================*/ + #ssbPageAction-image { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -13791,6 +13797,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } } @supports -moz-bool-pref("userChrome.icon.menu") { #toggle_sharemode { diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 1e6e15bb..e9986f03 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -1,3 +1,12 @@ +// Page Action button. Not always visible +#ssbPageAction-image { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + &[open-ssb="true"] { + // Page Action button. If page has been already installed or can be install PWA + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } +} + @include Option("userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -6,6 +15,20 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + + // Panel UI top button + #appMenu-ssb-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + + // Panel UI subView button for install ssb + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + &[open-ssb="true"] { + // Panel UI subView button for open ssb window + list-style-image: url("chrome://browser/skin/install-ssb.svg"); + } + } } @include Option("userChrome.icon.menu") { #toggle_sharemode { From 2180481ec8af42e44885caf797a20a9e901cc485 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 2 Dec 2023 14:57:41 +0900 Subject: [PATCH 09/17] Fix: Dark Mode - `support.mozilla` blockquote --- css/leptonContent.css | 8 ++++++++ css/leptonContentESR.css | 4 ++++ src/contents/dark_mode/_support_org.scss | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/css/leptonContent.css b/css/leptonContent.css index 62041ecf..d51e2360 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -1515,6 +1515,7 @@ background: var(--in-content-page-background) !important; } /* Text */ + blockquote, .mzp-c-menu-category .mzp-c-menu-title, .mzp-c-menu-item .mzp-c-menu-item-link, .mzp-c-menu-item .mzp-c-menu-item-link > *, @@ -1609,6 +1610,9 @@ .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) { color: var(--in-content-page-color) !important; } + blockquote { + border-color: var(--in-content-border-color) !important; + } .sumo-button.secondary-button { border-color: transparent !important; } @@ -5130,6 +5134,7 @@ background: var(--in-content-page-background) !important; } /* Text */ + blockquote, .mzp-c-menu-category .mzp-c-menu-title, .mzp-c-menu-item .mzp-c-menu-item-link, .mzp-c-menu-item .mzp-c-menu-item-link > *, @@ -5224,6 +5229,9 @@ .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) { color: var(--in-content-page-color) !important; } + blockquote { + border-color: var(--in-content-border-color) !important; + } .sumo-button.secondary-button { border-color: transparent !important; } diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index c1f079d8..36139795 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -1517,6 +1517,7 @@ background: var(--in-content-page-background) !important; } /* Text */ + blockquote, .mzp-c-menu-category .mzp-c-menu-title, .mzp-c-menu-item .mzp-c-menu-item-link, .mzp-c-menu-item .mzp-c-menu-item-link > *, @@ -1611,6 +1612,9 @@ .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) { color: var(--in-content-page-color) !important; } + blockquote { + border-color: var(--in-content-border-color) !important; + } .sumo-button.secondary-button { border-color: transparent !important; } diff --git a/src/contents/dark_mode/_support_org.scss b/src/contents/dark_mode/_support_org.scss index c1bd9b07..b0deeaa8 100644 --- a/src/contents/dark_mode/_support_org.scss +++ b/src/contents/dark_mode/_support_org.scss @@ -55,6 +55,7 @@ } /* Text */ + blockquote, .mzp-c-menu-category .mzp-c-menu-title, .mzp-c-menu-item .mzp-c-menu-item-link, .mzp-c-menu-item .mzp-c-menu-item-link > *, @@ -156,6 +157,9 @@ color: var(--in-content-page-color) !important; } + blockquote { + border-color: var(--in-content-border-color) !important; + } .sumo-button.secondary-button { border-color: transparent !important; } From 431d32e29e58557a71b480f43cde10e371d012ec Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 2 Dec 2023 15:55:03 +0900 Subject: [PATCH 10/17] Fix: Bookmarkbar - Multirow compatibility #830 --- css/leptonChrome.css | 6 ++++-- css/leptonChromeESR.css | 3 ++- src/bookmarkbar/_multi_row.scss | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 0e9f855e..19cde4a1 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8478,6 +8478,7 @@ --uc-multirow-bookmark-rows: 3; --uc-multirow-bookmark-row-margin: 2px; max-height: none !important; + height: unset !important; } #PlacesToolbar > hbox { display: block; @@ -8491,7 +8492,7 @@ max-height: calc( var(--uc-multirow-bookmark-rows) * ( - var(--uc-bm-height, calc(20px + 2 * var(--bookmark-block-padding, 4px))) + 2 * + var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + 2 * var(--uc-multirow-bookmark-row-margin) ) ) !important; @@ -22502,6 +22503,7 @@ --uc-multirow-bookmark-rows: 3; --uc-multirow-bookmark-row-margin: 2px; max-height: none !important; + height: unset !important; } #PlacesToolbar > hbox { display: block; @@ -22515,7 +22517,7 @@ max-height: calc( var(--uc-multirow-bookmark-rows) * ( - var(--uc-bm-height, calc(20px + 2 * var(--bookmark-block-padding, 4px))) + 2 * + var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + 2 * var(--uc-multirow-bookmark-row-margin) ) ) !important; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f5c88fac..542aa601 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -8887,6 +8887,7 @@ --uc-multirow-bookmark-rows: 3; --uc-multirow-bookmark-row-margin: 2px; max-height: none !important; + height: unset !important; } #PlacesToolbar > hbox { display: block; @@ -8900,7 +8901,7 @@ max-height: calc( var(--uc-multirow-bookmark-rows) * ( - var(--uc-bm-height, calc(20px + 2 * var(--bookmark-block-padding, 4px))) + 2 * + var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + 2 * var(--uc-multirow-bookmark-row-margin) ) ) !important; diff --git a/src/bookmarkbar/_multi_row.scss b/src/bookmarkbar/_multi_row.scss index 06dbd38f..dc653c49 100644 --- a/src/bookmarkbar/_multi_row.scss +++ b/src/bookmarkbar/_multi_row.scss @@ -5,6 +5,7 @@ --uc-multirow-bookmark-rows: 3; --uc-multirow-bookmark-row-margin: 2px; max-height: none !important; + height: unset !important; // var(--bookmarks-toolbar-overlapping-browser-height) } #PlacesToolbar > hbox { @@ -18,7 +19,7 @@ overflow-y: auto; scroll-snap-type: y mandatory; max-height: calc(var(--uc-multirow-bookmark-rows) * - (var(--uc-bm-height, calc(20px + (2 * var(--bookmark-block-padding, 4px)))) + + (var(--uc-bm-height, calc(20px + var(--bookmark-block-padding, 4px))) + (2 * var(--uc-multirow-bookmark-row-margin)))) !important; } From a04f700332eefd98592bedd69ac480b022cf05e0 Mon Sep 17 00:00:00 2001 From: Ryosuke Asano Date: Thu, 7 Dec 2023 00:17:21 +0900 Subject: [PATCH 11/17] Replace Floorp PWA icons --- css/leptonChrome.css | 32 +++++++++++++++++++--------- css/leptonChromeESR.css | 16 +++++++++----- src/icons/fork_browsers/_floorp.scss | 19 ++++++++++++----- 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 19cde4a1..39870ad4 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13177,10 +13177,10 @@ } /*= Floorp Browser ===========================================================*/ #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { @@ -13190,13 +13190,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13245,6 +13245,12 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + } } } /*@ NIGHTLY @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ @@ -28292,10 +28298,10 @@ } @media not (-moz-bool-pref: "userChrome.icon.disabled") { #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -28306,13 +28312,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @@ -28361,4 +28367,10 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 542aa601..681ad9a9 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13786,10 +13786,10 @@ } /*= Floorp Browser ===========================================================*/ #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { @@ -13799,13 +13799,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13854,5 +13854,11 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + } } } diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index e9986f03..48c2da0d 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -1,9 +1,9 @@ // Page Action button. Not always visible #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); &[open-ssb="true"] { // Page Action button. If page has been already installed or can be install PWA - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } @@ -18,15 +18,15 @@ // Panel UI top button #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); } // Panel UI subView button for install ssb #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); &[open-ssb="true"] { // Panel UI subView button for open ssb window - list-style-image: url("chrome://browser/skin/install-ssb.svg"); + list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); } } } @@ -85,4 +85,13 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + + // PWA Context Menu + #run-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + } + + #uninstall-ssb-contextmenu { + --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + } } From b5f5fed7bb8dabfbb536baec4a956db6b3abdcba Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 8 Dec 2023 01:17:58 +0900 Subject: [PATCH 12/17] Clean: Icons - Consistent path --- css/leptonChrome.css | 28 ++++++++++++++-------------- css/leptonChromeESR.css | 14 +++++++------- src/icons/fork_browsers/_floorp.scss | 15 +++++++-------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 39870ad4..10e551a3 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13177,10 +13177,10 @@ } /*= Floorp Browser ===========================================================*/ #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { @@ -13190,13 +13190,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); + list-style-image: url("../icons/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13246,10 +13246,10 @@ --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } #run-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + --menuitem-image: url("../icons/pwa-launch.svg"); } #uninstall-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + --menuitem-image: url("../icons/pwa-remove.svg"); } } } @@ -28298,10 +28298,10 @@ } @media not (-moz-bool-pref: "userChrome.icon.disabled") { #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -28312,13 +28312,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); + list-style-image: url("../icons/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { @@ -28368,9 +28368,9 @@ --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } #run-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + --menuitem-image: url("../icons/pwa-launch.svg"); } #uninstall-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + --menuitem-image: url("../icons/pwa-remove.svg"); } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 681ad9a9..1650ab85 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13786,10 +13786,10 @@ } /*= Floorp Browser ===========================================================*/ #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #ssbPageAction-image[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { @@ -13799,13 +13799,13 @@ list-style-image: var(--uc-folder-icon); } #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); + list-style-image: url("../icons/pwa-manage.svg"); } #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); } #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } @supports -moz-bool-pref("userChrome.icon.menu") { @@ -13855,10 +13855,10 @@ --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } #run-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + --menuitem-image: url("../icons/pwa-launch.svg"); } #uninstall-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + --menuitem-image: url("../icons/pwa-remove.svg"); } } } diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 48c2da0d..67c39475 100644 --- a/src/icons/fork_browsers/_floorp.scss +++ b/src/icons/fork_browsers/_floorp.scss @@ -1,9 +1,9 @@ // Page Action button. Not always visible #ssbPageAction-image { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); &[open-ssb="true"] { // Page Action button. If page has been already installed or can be install PWA - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } @@ -18,15 +18,15 @@ // Panel UI top button #appMenu-ssb-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-manage.svg"); + list-style-image: url("../icons/pwa-manage.svg"); } // Panel UI subView button for install ssb #appMenu-install-or-open-ssb-current-page-button { - list-style-image: url("chrome://browser/skin/lepton/pwa-install.svg"); + list-style-image: url("../icons/pwa-install.svg"); &[open-ssb="true"] { // Panel UI subView button for open ssb window - list-style-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + list-style-image: url("../icons/pwa-launch.svg"); } } } @@ -88,10 +88,9 @@ // PWA Context Menu #run-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-launch.svg"); + --menuitem-image: url("../icons/pwa-launch.svg"); } - #uninstall-ssb-contextmenu { - --menuitem-image: url("chrome://browser/skin/lepton/pwa-remove.svg"); + --menuitem-image: url("../icons/pwa-remove.svg"); } } From a526a818e4d346e606bb3431eaac2830f1b431e7 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Fri, 8 Dec 2023 01:38:28 +0900 Subject: [PATCH 13/17] Docs: README - Broken link #838 --- README.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index 1957d77b..65b6c029 100644 --- a/README.org +++ b/README.org @@ -37,8 +37,8 @@ You [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solu ----- ** Introduction - [[https://wiki.mozilla.org/Firefox/Proton][Proton]] is Firefox's new design, starting from Firefox 89. \\ - [[https://design.firefox.com/photon/][Photon]] is the old design of Firefox which was used until version 88. + [[https://wiki.mozilla.org/Firefox/Proton][Proton]] is Firefox's [[https://acorn.firefox.com/][new design]], starting from Firefox 89. \\ + [[https://firefoxux.github.io/photon/][Photon]] is the old design of Firefox which was used until version 88. Proton's [[#why-proton][overall feel is good]], but there were a few things I [[#why-not-proton][didn't like]] and wanted to improve. \\ That's why this project was born, and Lepton to denote light theme layer. From 6ef6a381c5ddea327f807edafac10d1cf1718cfd Mon Sep 17 00:00:00 2001 From: Piotr Gnus Date: Wed, 13 Dec 2023 17:13:02 +0100 Subject: [PATCH 14/17] fix: Profile path no longer being cut off on space Adjusted calls for setting ini variables to not skip everything after first whitespace as well as adjusted method of reading ini file to not skip them. Refs: #840 --- install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 185af73f..ab6c3772 100755 --- a/install.sh +++ b/install.sh @@ -185,7 +185,7 @@ write_file() { get_ini_section() { local filePath="$1" - local output=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g") + local output="$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g")" echo "${output}" } get_ini_value() { @@ -195,11 +195,11 @@ get_ini_value() { local output="" if [ "${section}" == "" ]; then - output=$(grep -E "^${key}" "${filePath}" | cut -f 2 -d"=") + output="$(grep -E "^${key}" "${filePath}" | cut -f 2 -d"=")" echo "${output}" else local sectionStart="" - for line in $(cat "${filePath}"); do + while IFS= read line; do if [[ "${sectionStart}" == "true" && "${line}" == "["* ]]; then return 0 fi @@ -209,12 +209,12 @@ get_ini_value() { fi if [ "${sectionStart}" == "true" ]; then - output=$(echo "${line}" | grep -E "^${key}" | cut -f 2 -d"=" ) + output="$(echo "${line}" | grep -E "^${key}" | cut -f 2 -d"=" )" if [ "${output}" != "" ]; then echo "${output}" fi fi - done + done < "${filePath}" fi } @@ -543,7 +543,7 @@ write_lepton_info() { fi for key in "Type" "Branch" "Ver" "Path"; do eval "local value=\${${key}}" - output="${output}$(set_ini_value ${key} ${value})" + output="${output}$(set_ini_value "${key}" "${value}")" done # Latest element flushing From eddf919d8e57f81c5b370da3be7ae7ee1a3292a0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 19 Dec 2023 22:16:14 +0900 Subject: [PATCH 15/17] Fix: Icons - Report broken site menu #843 --- css/leptonChrome.css | 8 ++++++++ css/leptonChromeESR.css | 3 +++ src/icons/_global_menu.scss | 3 +++ 3 files changed, 14 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 10e551a3..0452a906 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -13045,6 +13045,9 @@ #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); } + #help_reportBrokenSite { + --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg"); + } #feedbackPage { --menuitem-image: url("../icons/send.svg"); } @@ -28131,6 +28134,11 @@ --menuitem-image: url("chrome://global/skin/icons/help.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #help_reportBrokenSite { + --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #feedbackPage { --menuitem-image: url("../icons/send.svg"); diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 1650ab85..e832e15a 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -13654,6 +13654,9 @@ #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); } + #help_reportBrokenSite { + --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg"); + } #feedbackPage { --menuitem-image: url("../icons/send.svg"); } diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 95d9dcea..0c93d6f4 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -313,6 +313,9 @@ menu.share-tab-url-item { #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); } +#help_reportBrokenSite { + --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg"); +} #feedbackPage { --menuitem-image: url("../icons/send.svg"); } From 18570f99359bcea2d2d495eef87fe377aa711e96 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 20 Dec 2023 18:52:33 +0900 Subject: [PATCH 16/17] Fix: Menu - Windows non native context menu padding --- css/leptonChrome.css | 12 ++++++++++++ css/leptonChromeESR.css | 6 ++++++ src/icons/layout/_menu.scss | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 0452a906..768ace0a 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11605,6 +11605,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } @media (-moz-platform: windows), (-moz-gtk-csd-available) { @supports -moz-bool-pref("userChrome.theme.non_native_menu") { @@ -11670,6 +11673,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } } } @@ -26174,6 +26180,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available), (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) { @@ -26234,6 +26243,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) { :root { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index e832e15a..01d509da 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -12025,6 +12025,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), @@ -12097,6 +12100,9 @@ padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } } } diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index 03e3bf4d..b94e82f5 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -94,6 +94,11 @@ $_layoutCommonMenus: ( @include _layoutIconMenus { @include _layout_init_non_native(); } + + // FF v121 + .menupopup-arrowscrollbox { + padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */ + } } } From 44494c684e8d144fcb53877135aca70149d1b9a5 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 21 Dec 2023 23:33:15 +0900 Subject: [PATCH 17/17] Doc: CREDITS - Sponsor update --- CREDITS | 5 ++++- README.org | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CREDITS b/CREDITS index 0c3155a0..54dbb011 100644 --- a/CREDITS +++ b/CREDITS @@ -35,7 +35,10 @@ W: https://github.com/Babbiorsetto N: Alex Besogonov E: Alex.Besogonov@gmail.com -W: Alex.Besogonov@gmail.com +W: https://github.com/Cyberax + +N: AuRiMaS666 +W: https://github.com/AuRiMaS666 N: Jani Haiko E: haiko.jani@gmail.com diff --git a/README.org b/README.org index 65b6c029..894a13b8 100644 --- a/README.org +++ b/README.org @@ -208,6 +208,7 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[https://github.com/Babbiorsetto][@@html:@@]] [[https://github.com/Mike-Kennelly][@@html:@@]] [[https://github.com/Cyberax][@@html:@@]] +[[https://github.com/AuRiMaS666][@@html:@@]] - A donation was received from Safira on [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Ko-Fi]] - Private sponsors: 3