diff --git a/CREDITS b/CREDITS index 3c6219af..54dbb011 100644 --- a/CREDITS +++ b/CREDITS @@ -28,9 +28,18 @@ 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: https://github.com/Cyberax + +N: AuRiMaS666 +W: https://github.com/AuRiMaS666 + N: Jani Haiko E: haiko.jani@gmail.com W: https://github.com/ojaha065 @@ -42,6 +51,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 +61,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 d964368a..10a441d7 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. @@ -198,6 +198,12 @@ 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:@@]] +[[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 *Contributors* diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 14b3ccba..768ace0a 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; } @@ -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 @@ -7189,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 */ + } } } } @@ -8471,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; @@ -8484,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; @@ -11196,6 +11204,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"); } @@ -11596,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") { @@ -11661,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; */ + } } } } @@ -12105,9 +12120,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); } @@ -12243,30 +12256,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 { @@ -13028,6 +13051,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"); } @@ -13159,6 +13185,12 @@ } } /*= Floorp Browser ===========================================================*/ + #ssbPageAction-image { + list-style-image: url("../icons/pwa-install.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.svg"); + } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -13166,6 +13198,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("../icons/pwa-manage.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("../icons/pwa-install.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.svg"); + } } @supports -moz-bool-pref("userChrome.icon.menu") { #toggle_sharemode { @@ -13213,6 +13254,12 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-remove.svg"); + } } } /*@ NIGHTLY @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ @@ -15206,7 +15253,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; } @@ -20505,6 +20552,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 @@ -21110,25 +21161,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 */ } @@ -22468,6 +22518,7 @@ --uc-multirow-bookmark-rows: 3; --uc-multirow-bookmark-row-margin: 2px; max-height: none !important; + height: unset !important; } #PlacesToolbar > hbox { display: block; @@ -22481,7 +22532,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; @@ -25655,6 +25706,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"); } @@ -26128,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) { @@ -26188,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 { @@ -26714,11 +26772,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); } @@ -26939,43 +26993,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"); } } @@ -28080,6 +28146,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"); @@ -28245,6 +28316,14 @@ --menuitem-image: url("chrome://browser/skin/onion.svg"); } } +@media not (-moz-bool-pref: "userChrome.icon.disabled") { + #ssbPageAction-image { + list-style-image: url("../icons/pwa-install.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.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"); @@ -28252,6 +28331,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("../icons/pwa-manage.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("../icons/pwa-install.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.svg"); + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { #toggle_sharemode { @@ -28299,4 +28387,10 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-remove.svg"); + } } diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 07fe5ce3..01d509da 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; } @@ -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 @@ -7598,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 */ + } } } } @@ -8880,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; @@ -8893,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; @@ -11613,6 +11621,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"); } @@ -12016,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), @@ -12088,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; */ + } } } } @@ -12714,9 +12729,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); } @@ -12852,30 +12865,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 { @@ -13637,6 +13660,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"); } @@ -13768,6 +13794,12 @@ } } /*= Floorp Browser ===========================================================*/ + #ssbPageAction-image { + list-style-image: url("../icons/pwa-install.svg"); + } + #ssbPageAction-image[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.svg"); + } @supports -moz-bool-pref("userChrome.icon.panel") { #rebootappmenu { list-style-image: url("../icons/refresh-cw.svg"); @@ -13775,6 +13807,15 @@ #openprofiledir { list-style-image: var(--uc-folder-icon); } + #appMenu-ssb-button { + list-style-image: url("../icons/pwa-manage.svg"); + } + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("../icons/pwa-install.svg"); + } + #appMenu-install-or-open-ssb-current-page-button[open-ssb="true"] { + list-style-image: url("../icons/pwa-launch.svg"); + } } @supports -moz-bool-pref("userChrome.icon.menu") { #toggle_sharemode { @@ -13822,5 +13863,11 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + #run-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-remove.svg"); + } } } 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/icons/pwa-install.svg b/icons/pwa-install.svg new file mode 100644 index 00000000..37d05c18 --- /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..e7662e13 --- /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..5bed6199 --- /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..3362b74e --- /dev/null +++ b/icons/pwa-remove.svg @@ -0,0 +1 @@ + \ No newline at end of file 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/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 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; } 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; } 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"); } 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 { diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss index 1e6e15bb..67c39475 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("../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("../icons/pwa-launch.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("../icons/pwa-manage.svg"); + } + + // Panel UI subView button for install ssb + #appMenu-install-or-open-ssb-current-page-button { + list-style-image: url("../icons/pwa-install.svg"); + &[open-ssb="true"] { + // Panel UI subView button for open ssb window + list-style-image: url("../icons/pwa-launch.svg"); + } + } } @include Option("userChrome.icon.menu") { #toggle_sharemode { @@ -62,4 +85,12 @@ #deleteWebpanelMenu { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } + + // PWA Context Menu + #run-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-launch.svg"); + } + #uninstall-ssb-contextmenu { + --menuitem-image: url("../icons/pwa-remove.svg"); + } } 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; */ + } } } 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 */ + } } } } 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 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; }