From 1f9101781540a2e6a1361434147f76b7957cf3da Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 31 Mar 2023 21:07:21 +0900 Subject: [PATCH 01/24] Add: Icons - Context reveal password #672 --- css/leptonChrome.css | 3 +++ src/icons/context_menu/_content_area.scss | 3 +++ 2 files changed, 6 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index db99d2d..c6e291c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11349,6 +11349,9 @@ #context-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-reveal-password { + --menuitem-image: url("../icons/eye-show.svg"); + } #context-print-selection { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 7821478..8c938a2 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -190,6 +190,9 @@ #context-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } +#context-reveal-password { + --menuitem-image: url("../icons/eye-show.svg"); +} #context-print-selection { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } From eb32c2a8642c6181a834a2448dba9da64ada527b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 5 Apr 2023 16:05:41 +0900 Subject: [PATCH 02/24] Fix: Icons - Unified extension context menu's pin --- css/leptonChrome.css | 3 +++ src/icons/context_menu/_others.scss | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c6e291c..7db311b 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11783,6 +11783,9 @@ --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } /*= unified-extensions-context-menu ==========================================*/ + .unified-extensions-context-menu-pin-to-toolbar { + --menuitem-image: url("../icons/pin-tab.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index bb37ded..361a821 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -227,6 +227,10 @@ menuitem.searchbar-clear-history { } /*= unified-extensions-context-menu ==========================================*/ +.unified-extensions-context-menu-pin-to-toolbar { + --menuitem-image: url("../icons/pin-tab.svg"); +} + .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } From 5c70217158fbd97f49335cb7e47b0074b9546d41 Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Sun, 9 Apr 2023 11:29:29 +0500 Subject: [PATCH 03/24] Fix: Rounding - Addons toggle button #667 --- css/leptonContent.css | 2 +- src/contents/_rounding.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 327a24c..f47ec7e 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2790,7 +2790,7 @@ @supports -moz-bool-pref("userChrome.rounding.square_button") { @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") { - button, + button:not(.toggle-button), .close-icon, .action-icon::before, .web-appearance-choice, diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index b0452d1..c7a3f48 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -3,7 +3,7 @@ url-prefix "about:", regexp "^chrome:\/\/\\w+\/content\/.*\.xhtml$" ) { - button, + button:not(.toggle-button), .close-icon, .action-icon::before, .web-appearance-choice, From 79ec43f0adc1b6d0c43e1019bedd95bd7e02f546 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 11 Apr 2023 18:36:45 +0900 Subject: [PATCH 04/24] Fix: Combined - Subbutton as normal #671 --- css/leptonChrome.css | 11 ++--------- src/combined/_back_forward_button.scss | 6 ++++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7db311b..60fbc06 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8183,15 +8183,8 @@ } @supports -moz-bool-pref("userChrome.combined.nav_button") or -moz-bool-pref("userChrome.combined.urlbar.nav_button") { @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") or - ( - not - ( - -moz-bool-pref("userChrome.combined.sub_button.as_normal") and -moz-bool-pref( - "userChrome.combined.nav_button" - ) - and -moz-bool-pref("userChrome.combined.urlbar.home_button") - ) - ) { + (not -moz-bool-pref("userChrome.combined.sub_button.as_normal")) or + (-moz-bool-pref("userChrome.combined.nav_button") and -moz-bool-pref("userChrome.combined.urlbar.home_button")) { #nav-bar-customization-target > #forward-button { --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px); z-index: 2; diff --git a/src/combined/_back_forward_button.scss b/src/combined/_back_forward_button.scss index e237209..715c8eb 100644 --- a/src/combined/_back_forward_button.scss +++ b/src/combined/_back_forward_button.scss @@ -40,10 +40,12 @@ #nav-bar-customization-target > { @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") or - (not (-moz-bool-pref("userChrome.combined.sub_button.as_normal") and + ((not -moz-bool-pref("userChrome.combined.sub_button.as_normal")) or + ( -moz-bool-pref("userChrome.combined.nav_button") and -moz-bool-pref("userChrome.combined.urlbar.home_button") - )) { + ) + ) { #forward-button { --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px); From eec36701e60aa20ac2548e76aac4ef6f41889563 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 11 Apr 2023 19:07:35 +0900 Subject: [PATCH 05/24] Fix: Findbar - Firefox 112 compatibility #673 --- css/leptonChrome.css | 3 ++- src/others/_findbar_floating_on_top.scss | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 60fbc06..5d1715e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8704,7 +8704,7 @@ z-index: 1; } findbar { - order: 0; + order: -1; -moz-box-ordinal-group: 0; position: relative; height: 0 !important; @@ -8720,6 +8720,7 @@ findbar::before { content: ""; display: -moz-box; + position: absolute; flex: 200; -moz-box-flex: 200; } diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss index 0d80267..a9ca31f 100644 --- a/src/others/_findbar_floating_on_top.scss +++ b/src/others/_findbar_floating_on_top.scss @@ -9,7 +9,8 @@ See the above repository for updates as well as full license text. */ } findbar { - @include BoxOrder(0); + order: -1; // @include BoxOrder(0); + -moz-box-ordinal-group: 0; position: relative; height: 0 !important; @@ -28,6 +29,7 @@ findbar { &::before { content:""; display: -moz-box; + position: absolute; @include BoxFlex(200); } } From 8405be19d3feb7ee8d14dbe57e90d3ce3d7fd7f5 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 15 Apr 2023 00:45:44 +0900 Subject: [PATCH 06/24] Fix: Icons - Contain `add-device.svg` #676 --- css/leptonChrome.css | 2 +- icons/add-device.svg | 7 +++++++ src/icons/_panel.scss | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 icons/add-device.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5d1715e..51fc0fd 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10200,7 +10200,7 @@ list-style-image: url("chrome://browser/skin/sync.svg"); } #PanelUI-fxa-menu-connect-device-button { - list-style-image: url("chrome://browser/skin/fxa/add-device.svg"); + list-style-image: url("../icons/add-device.svg"); } #PanelUI-fxa-menu-sendtab-button { list-style-image: url("../icons/send-to-device.svg"); diff --git a/icons/add-device.svg b/icons/add-device.svg new file mode 100644 index 0000000..10fef2b --- /dev/null +++ b/icons/add-device.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 172381d..a5ac4d6 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -162,7 +162,7 @@ } #PanelUI-fxa-menu-connect-device-button { - list-style-image: url("chrome://browser/skin/fxa/add-device.svg"); + list-style-image: url("../icons/add-device.svg"); } #PanelUI-fxa-menu-sendtab-button { list-style-image: url("../icons/send-to-device.svg"); From 0eeab6060cec1ce6fd65abf377966f1b995b2d5a Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Sat, 15 Apr 2023 10:17:58 +0500 Subject: [PATCH 07/24] Add: Rounding - Square infoboxes --- css/leptonChrome.css | 7 +++++++ css/leptonContent.css | 22 ++++++++++++++++++++++ src/contents/_rounding.scss | 26 ++++++++++++++++++++++++++ src/rounding/_square.scss | 8 ++++++++ user.js | 1 + 5 files changed, 64 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 51fc0fd..62ce04d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3181,6 +3181,13 @@ border-radius: 0 !important; } } +@supports -moz-bool-pref("userChrome.rounding.square_infobox") { + .container.infobar, + .container.infobar::before, + notification-message { + border-radius: 0 !important; + } +} @supports -moz-bool-pref("userChrome.rounding.square_field") { input:not([type="radio"], [type="checkbox"]), textarea, diff --git a/css/leptonContent.css b/css/leptonContent.css index f47ec7e..d7fda5b 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2920,6 +2920,28 @@ } } } +@supports -moz-bool-pref("userChrome.rounding.square_infobox") { + @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") + { + /* + * .container is inside shadow DOM, + * and it does not have any other classes, + * but there may be other elements with the same class, + * hence the weird selector. + */ + link[href="chrome://global/content/elements/message-bar.css"] + .container, + .info-box-container, + .options-container, + #sanitizeEverythingWarningBox { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("about:debugging") { + .message { + border-radius: 0 !important; + } + } +} @-moz-document url("chrome://browser/content/places/places.xhtml") { /*= Library ==============================================================*/ diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index c7a3f48..0a43e17 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -154,3 +154,29 @@ } } } + +@include Option("userChrome.rounding.square_infobox") { + @include moz-document( + url-prefix "about:", + regexp "^chrome:\/\/\\w+\/content\/.*\.xhtml$" + ) { + /* + * .container is inside shadow DOM, + * and it does not have any other classes, + * but there may be other elements with the same class, + * hence the weird selector. + */ + link[href="chrome://global/content/elements/message-bar.css"] + .container, + .info-box-container, + .options-container, + #sanitizeEverythingWarningBox { + border-radius: 0 !important; + } + } + + @include moz-document(url-prefix "about:debugging") { + .message { + border-radius: 0 !important; + } + } +} diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 78235df..9cfea74 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -71,6 +71,14 @@ } } +@include Option("userChrome.rounding.square_infobox") { + .container.infobar, + .container.infobar::before, + notification-message { + border-radius: 0 !important; + } +} + @include Option("userChrome.rounding.square_field") { input:not([type="radio"], [type="checkbox"]), textarea, diff --git a/user.js b/user.js index e886d31..35a02c5 100644 --- a/user.js +++ b/user.js @@ -126,6 +126,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.rounding.square_panelitem", true); // user_pref("userChrome.rounding.square_menupopup", true); // user_pref("userChrome.rounding.square_menuitem", true); +// user_pref("userChrome.rounding.square_infobox", true); // user_pref("userChrome.rounding.square_field", true); // user_pref("userChrome.rounding.square_urlView_item", true); // user_pref("userChrome.rounding.square_checklabel", true); From 7a7081d65826ceb44dc0cf2a2eed0229e6ee79bd Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 16 Apr 2023 08:11:40 +0900 Subject: [PATCH 08/24] Fix: Compatibility - order 0 to -1 at FF v112 #670 #673 --- css/leptonChrome.css | 12 ++++++------ src/others/_findbar_floating_on_top.scss | 3 +-- src/utils/_moz_box.scss | 7 ++++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 51fc0fd..9be5bd3 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7226,7 +7226,7 @@ .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { display: -moz-box !important; - order: 0 !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -7245,7 +7245,7 @@ @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.always") { .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button { display: -moz-box !important; - order: 0 !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -7265,7 +7265,7 @@ @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.background") { .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { display: -moz-box !important; - order: 0 !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -9595,7 +9595,7 @@ } @supports -moz-bool-pref("userChrome.autohide.fill_urlbar") { #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container { - order: 0; + order: -1; -moz-box-ordinal-group: 0; min-width: calc( var(--uc-navbar-width, 100vw) - @@ -10047,7 +10047,7 @@ #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { display: -moz-inline-box !important; margin-inline-start: var(--arrowpanel-menuicon-padding); - order: 0 !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; } #appMenu-proton-update-banner::before { @@ -10241,7 +10241,7 @@ padding: 0; } #PanelUI-fxa-menu > :first-child { - order: 0; + order: -1; -moz-box-ordinal-group: 0; } #PanelUI-sign-out-separator { diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss index a9ca31f..e7d81c3 100644 --- a/src/others/_findbar_floating_on_top.scss +++ b/src/others/_findbar_floating_on_top.scss @@ -9,8 +9,7 @@ See the above repository for updates as well as full license text. */ } findbar { - order: -1; // @include BoxOrder(0); - -moz-box-ordinal-group: 0; + @include BoxOrder(0); position: relative; height: 0 !important; diff --git a/src/utils/_moz_box.scss b/src/utils/_moz_box.scss index 87aa276..b095e06 100644 --- a/src/utils/_moz_box.scss +++ b/src/utils/_moz_box.scss @@ -20,7 +20,12 @@ $important: _important($important); // -moz-box-ordinal-group is always positive - order: $num $important; + @if $num == 0 { + order: -1 $important; + } + @else { + order: $num $important; + } -moz-box-ordinal-group: $num $important; } From 2c70deaea4fd7970d2a2d1fd304143d4df5ccd63 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 16 Apr 2023 21:59:12 +0900 Subject: [PATCH 09/24] Fix: Tab - Bottom rounded corner like new tabbutton overlap #678 --- css/leptonChrome.css | 6 ++++++ src/tab/newtab_button/_looks_like_tab.scss | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 9be5bd3..3f989da 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7073,6 +7073,12 @@ background-color: transparent !important; } } + /* Fix tab overlap #678 */ + @supports -moz-bool-pref("userChrome.tab.bottom_rounded_corner") { + tab:where([visuallyselected="true"]) { + z-index: 1; + } + } } /*= New tab button - Smaller button ==========================================*/ @supports -moz-bool-pref("userChrome.tab.newtab_button_smaller") { diff --git a/src/tab/newtab_button/_looks_like_tab.scss b/src/tab/newtab_button/_looks_like_tab.scss index 3b6de4f..ef6e103 100644 --- a/src/tab/newtab_button/_looks_like_tab.scss +++ b/src/tab/newtab_button/_looks_like_tab.scss @@ -143,3 +143,10 @@ // background-position: center; } } + +/* Fix tab overlap #678 */ +@include Option("userChrome.tab.bottom_rounded_corner") { + tab:where([visuallyselected="true"]) { + z-index: 1; + } +} From af2faa4d0565e75f9a6cafa9dfd32ad8c3e78307 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 16 Apr 2023 23:36:48 +0900 Subject: [PATCH 10/24] Fix: Proton - Page Info icon overlap at FF v110 #680 --- css/leptonChrome.css | 3 +++ src/theme/proton_chrome/_page_info.scss | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3f989da..0cc5d90 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2282,6 +2282,9 @@ fill: currentColor !important; color: var(--in-content-deemphasized-text) !important; /* FieldText */ } + #viewGroup > radio .radio-icon { + background-image: none !important; + } @supports not -moz-bool-pref("userChrome.rounding.square_button") { #viewGroup > radio { border-radius: 8px !important; diff --git a/src/theme/proton_chrome/_page_info.scss b/src/theme/proton_chrome/_page_info.scss index 7e7624d..df9dc00 100644 --- a/src/theme/proton_chrome/_page_info.scss +++ b/src/theme/proton_chrome/_page_info.scss @@ -18,6 +18,10 @@ fill: currentColor !important; color: var(--in-content-deemphasized-text) !important; /* FieldText */ + .radio-icon { + background-image: none !important; // #680 + } + @include NotOption("userChrome.rounding.square_button") { border-radius: 8px !important; } From de22277550100a17665479313ab37003ca202b66 Mon Sep 17 00:00:00 2001 From: "Patricek (she/her)" Date: Sun, 16 Apr 2023 16:50:54 +0200 Subject: [PATCH 11/24] Doc: README - 3Dots to unicdes #681 --- README.org | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.org b/README.org index 936cfb3..623c73e 100644 --- a/README.org +++ b/README.org @@ -70,7 +70,7 @@ You [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solu - Panel - Menu - Density - - Others... + - Others… - *Tab Bar Layouts* - Tabs on Bottom - One Liner @@ -82,7 +82,7 @@ You [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solu - Box Shadow: Highlight the selected tab - Bottom Rounding: Natural - MultiSelected - - Adjust Color: Easily recognizable. + - Adjust Color: Easily recognizable - Unselect: - Divide Line: React to hover like chrome - Unloaded: @@ -95,7 +95,7 @@ You [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solu - Show Favicon: Always show favicon - PIP Icon - Container Tab: - - Highlight line position: Displayed under tab. + - Highlight line position: Displayed under tab - *Button Design* - New tab: Looks like tab - *Activity Stream Design* @@ -149,7 +149,7 @@ Windows users: Run with powershell ([[https://github.com/black7375/Firefox-UI-Fi - Create a new directory inside your profile directory called =chrome= - Copy the remaining files from the extracted zip-file into previously created the =chrome= directory 4. Restart Firefox - - Click the =Clear startup cache...= at the top of =about:support= + - Click the =Clear startup cache…= at the top of =about:support= If you prefer Photon, see [[https://github.com/black7375/Firefox-UI-Fix/tree/photon-style][Lepton's photon-style]].\\ If you prefer Proton, see [[https://github.com/black7375/Firefox-UI-Fix/tree/proton-style][Lepton's proton-style]]. From 770d871fd5e2d3b7e08d1379f3e3e1e8fdacab97 Mon Sep 17 00:00:00 2001 From: "Patricek (she/her)" Date: Mon, 17 Apr 2023 07:36:34 +0200 Subject: [PATCH 12/24] Doc: Smart Bookmarks - Missing periods at end of the sentences #682 --- docs/Smart_Bookmarks.md | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/Smart_Bookmarks.md b/docs/Smart_Bookmarks.md index b3de43f..3727eea 100644 --- a/docs/Smart_Bookmarks.md +++ b/docs/Smart_Bookmarks.md @@ -87,7 +87,7 @@ Here's a list of the parameters available that you can look for. | | | `PLACES_ROOT`: The Places root folder. | | | | `BOOKMARKS_MENU`: The Bookmarks menu. | | | | `TOOLBAR`: The bookmarks toolbar. | -| | | `TAGS`: Tags | +| | | `TAGS`: Tags. | | | | `UNFILED_BOOKMARKS`: Unfiled bookmarks | | `!annotation` | `boolean` | Indicates whether to include or reject items matching the annotation specified by `annotation`. If `true`, items that don't have the specified annotation are rejected. | | `annotation` | `string` | The annotation to match when querying. | @@ -113,38 +113,38 @@ The following attributes allow you to control the results more precisely. | `maxResults` | `unsigned long` | The maximum number of results to return. This doesn't work when sorting by title. The result is `0`, which means that all results are returned. | | `originalTitle` | `string` | Retrieves the original page title. | | `queryType` | `unsigned short` | The type of search to use when querying the database. This attribute is only honored by query nodes. It's ignored for simple folder queries. | -| | | `0`: History | -| | | `1`: Bookmarks | -| | | `2`: Both history and bookmarks (**Not yet implemented** -- see [bug 378798](https://bugzilla.mozilla.org/show_bug.cgi?id=378798)) | +| | | `0`: History. | +| | | `1`: Bookmarks. | +| | | `2`: Both history and bookmarks (**Not yet implemented** -- see [bug 378798](https://bugzilla.mozilla.org/show_bug.cgi?id=378798)). | | `resolveNullBookmarkTitles` | `boolean` | If `true`, bookmarks with null titles get their page titles fetched from history if possible. This doesn't apply to bookmarks with empty titles. The default is `false`. | | `showSessions` | `boolean` | If `true`, session information is used to group history items. This only makes a difference when sorting by date. The default is `false`. | | `sort` | `unsigned short` | The sort order to use for the results. | -| | | `0`: Natural bookmark order | -| | | `1`: Sort by title, A-Z | -| | | `2`: Sort by title, Z-A | -| | | `3`: Sort by visit date, most recent last | -| | | `4`: Sort by visit date, most recent first | -| | | `5`: Sort by uri, A-Z | -| | | `6`: Sort by uri, Z-A | -| | | `7`: Sort by visit count, ascending | -| | | `8`: Sort by visit count, descending | -| | | `9`: Sort by keyword, A-Z | -| | | `10`: Sort by keyword, Z-A | -| | | `11`: Sort by date added, most recent last | -| | | `12`: Sort by date added, most recent first | -| | | `13`: Sort by last modified date, most recent last | -| | | `14`: Sort by last modified date, most recent first | -| | | `17`: Sort by tags, ascending | -| | | `18`: Sort by tags, descending | -| | | `19`: Sort by annotation, ascending | -| | | `20`: Sort by annotation, descending | +| | | `0`: Natural bookmark order. | +| | | `1`: Sort by title, A-Z. | +| | | `2`: Sort by title, Z-A. | +| | | `3`: Sort by visit date, most recent last. | +| | | `4`: Sort by visit date, most recent first. | +| | | `5`: Sort by uri, A-Z. | +| | | `6`: Sort by uri, Z-A. | +| | | `7`: Sort by visit count, ascending. | +| | | `8`: Sort by visit count, descending. | +| | | `9`: Sort by keyword, A-Z. | +| | | `10`: Sort by keyword, Z-A. | +| | | `11`: Sort by date added, most recent last. | +| | | `12`: Sort by date added, most recent first. | +| | | `13`: Sort by last modified date, most recent last. | +| | | `14`: Sort by last modified date, most recent first. | +| | | `17`: Sort by tags, ascending. | +| | | `18`: Sort by tags, descending. | +| | | `19`: Sort by annotation, ascending. | +| | | `20`: Sort by annotation, descending. | | `sortingAnnotation` | `string` | The annotation to use when sorting by annotation. | | `type` | `unsigned short` | The type of results to return. | | | | `0`: Results as URI ("URI" results, one for each URI visited in the range). | | | | `1`: Results as visit ("visit" results, with one for each time a page was visited this will often give you multiple results for one URI). | -| | | `2`: Results as full visits (like "visit", but returns all attributes for each result) | -| | | `3`: Results as date query (returns results for given date range) | -| | | `4`: Results as site query (returns last visit for each url in the given host) | -| | | `5`: Results as date+site query (returns list of hosts visited in the given period) | -| | | `6`: Results as tag query (returns list of bookmarks with the given tag) | -| | | `7`: Results as tag container (returns bookmarks with given tag; for same uri uses last modified. `folder=tag_folder_id` must be present in the query | +| | | `2`: Results as full visits (like "visit", but returns all attributes for each result). | +| | | `3`: Results as date query (returns results for given date range). | +| | | `4`: Results as site query (returns last visit for each url in the given host). | +| | | `5`: Results as date+site query (returns list of hosts visited in the given period). | +| | | `6`: Results as tag query (returns list of bookmarks with the given tag). | +| | | `7`: Results as tag container (returns bookmarks with given tag; for same uri uses last modified. `folder=tag_folder_id` must be present in the query. | From e0c9318084560bd713055a8ba409bb5d4b3ba35f Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:54:20 +0500 Subject: [PATCH 13/24] Fix: Rounding - Move web appearance & privacy to field --- css/leptonContent.css | 7 ++++--- src/contents/_rounding.scss | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index d7fda5b..05d08df 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2793,7 +2793,6 @@ button:not(.toggle-button), .close-icon, .action-icon::before, - .web-appearance-choice, .page-section-header > .twisty, .closed-tab-li-main, #categories > .category, @@ -2869,7 +2868,9 @@ treecols, listheader, richlistbox, - search-textbox { + search-textbox, + .web-appearance-choice, + .content-blocking-category { border-radius: 0 !important; } } @@ -2930,7 +2931,7 @@ * hence the weird selector. */ link[href="chrome://global/content/elements/message-bar.css"] + .container, - .info-box-container, + .info-box-container:not(.content-blocking-category), .options-container, #sanitizeEverythingWarningBox { border-radius: 0 !important; diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index 0a43e17..e6db50b 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -6,7 +6,6 @@ button:not(.toggle-button), .close-icon, .action-icon::before, - .web-appearance-choice, .page-section-header > .twisty, .closed-tab-li-main, #categories > .category, @@ -94,7 +93,9 @@ treecols, listheader, richlistbox, - search-textbox { + search-textbox, + .web-appearance-choice, + .content-blocking-category { border-radius: 0 !important; } } @@ -167,7 +168,7 @@ * hence the weird selector. */ link[href="chrome://global/content/elements/message-bar.css"] + .container, - .info-box-container, + .info-box-container:not(.content-blocking-category), .options-container, #sanitizeEverythingWarningBox { border-radius: 0 !important; From 20778eee1be87066466cf66517e9ca7047d27b6c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 18 Apr 2023 17:46:06 +0900 Subject: [PATCH 14/24] Doc: CREDITS - Add contributor #681 #682 --- CREDITS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index 62fdfd5..5180b22 100644 --- a/CREDITS +++ b/CREDITS @@ -108,6 +108,10 @@ W: https://github.com/MarNicGit N: Oondanomala W: https://github.com/Oondanomala +N: Patricek +E: pk22.games@gmail.com +W: https://github.com/Patricek0056 + N: ph3b3 E: phoebeleong8@gmail.com W: https://phoebe-leong.github.io/ From 8001818bfa6763a2c8bc44aa2aa02b2222349672 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 18 Apr 2023 17:49:16 +0900 Subject: [PATCH 15/24] Clean: user.js - setting order align --- user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user.js b/user.js index e886d31..c38d7a1 100644 --- a/user.js +++ b/user.js @@ -65,12 +65,12 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true); // user_pref("userChrome.compatibility.os.windows_maximized", true); +// user_pref("userChrome.compatibility.os.win11", true); // == Theme Custom Settings ==================================================== // -- User Chrome -------------------------------------------------------------- // user_pref("userChrome.theme.proton_color.dark_blue_accent", true); // user_pref("userChrome.theme.monospace", true); -// user_pref("userChrome.compatibility.os.win11", true); // user_pref("userChrome.decoration.disable_panel_animate", true); // user_pref("userChrome.decoration.disable_sidebar_animate", true); From c7907b67cd152d34b8c315377d9f69f96e85fa20 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 19 Apr 2023 10:01:16 +0900 Subject: [PATCH 16/24] Fix: Theme - Insecure warning complete popup at fully color theme #686 --- css/leptonChrome.css | 20 ++++++++++++++++++-- src/decoration/_cursor.scss | 3 ++- src/theme/_fully_color.scss | 14 +++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 437056e..c505a91 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1542,7 +1542,8 @@ } #PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon, #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon, - #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon, + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { fill: GrayText !important; } #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] { @@ -1558,6 +1559,15 @@ hsla(0deg, 0%, 80%, 0.5) ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--panel-bgcolor) !important; /* Original: var(--arrowpanel-dimmed) */ + } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"]:hover { + background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; + } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: var(--grey-60) */ + } /* New Folder Button */ #editBMPanel_newFolderButton { appearance: none; @@ -2809,7 +2819,13 @@ #identity-popup-more-info, #unified-extensions-manage-extensions, .unified-extensions-item-open-menu, - .unified-extensions-item-menu-button.subviewbutton { + .unified-extensions-item-menu-button.subviewbutton, + #PopupAutoComplete + > richlistbox + > richlistitem[originaltype="insecureWarning"] + > .ac-title + > .ac-text-overflow-container + > .ac-title-text { cursor: pointer !important; } } diff --git a/src/decoration/_cursor.scss b/src/decoration/_cursor.scss index acc4b34..8e2f2a3 100644 --- a/src/decoration/_cursor.scss +++ b/src/decoration/_cursor.scss @@ -24,7 +24,8 @@ menuitem.openintabs-menuitem, #identity-popup-more-info, #unified-extensions-manage-extensions, .unified-extensions-item-open-menu, -.unified-extensions-item-menu-button.subviewbutton { +.unified-extensions-item-menu-button.subviewbutton, +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title > .ac-text-overflow-container > .ac-title-text { cursor: pointer !important; } diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 9e6f1cb..bd762ec 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -239,7 +239,8 @@ body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { #PopupAutoComplete > richlistbox > richlistitem { &[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon, &[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon, - &[originaltype="login"] > .ac-site-icon { + &[originaltype="login"] > .ac-site-icon, + &[originaltype="insecureWarning"] > .ac-site-icon { fill: GrayText !important; } @@ -257,4 +258,15 @@ body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { hsla(0, 0%, 80%, 0.5) ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } + + &[originaltype="insecureWarning"] { + background-color: var(--panel-bgcolor) !important; /* Original: var(--arrowpanel-dimmed) */ + &:hover { + background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; + } + + > .ac-title { + color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: var(--grey-60) */ + } + } } From e4fe01c4618c5b3f9b25c0d2e0fb23441a60071f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 20 Apr 2023 04:10:09 +0900 Subject: [PATCH 17/24] Fix: Icons - Account panel order, padding --- css/leptonChrome.css | 6 +++--- src/icons/_panel.scss | 2 +- src/icons/layout/_panel.scss | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c505a91..3d7e790 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9984,7 +9984,7 @@ :root { --arrowpanel-menuicon-padding: 8px; --arrowpanel-menublank-padding: calc( - var(--arrowpanel-menuicon-padding) * 2 + var(var(--arrowpanel-menuitem-padding-inline)) + var(--arrowpanel-menuicon-padding) * 2 + var(--arrowpanel-menuitem-padding-inline) ) !important; --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important; @@ -10224,8 +10224,8 @@ } .syncNowBtn { visibility: visible !important; - order: 1 !important; - -moz-box-ordinal-group: 1 !important; + order: -1 !important; + -moz-box-ordinal-group: 0 !important; margin-inline-end: var(--arrowpanel-menuicon-padding); } #PanelUI-fxa-menu-setup-sync-button { diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index a5ac4d6..f26b5ca 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -153,7 +153,7 @@ .syncNowBtn { visibility: visible !important; - @include BoxOrder(1, true); + @include BoxOrder(0, true); margin-inline-end: var(--arrowpanel-menuicon-padding); } diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index 538c27c..49c1254 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -1,7 +1,7 @@ /*= Padding ==================================================================*/ :root { --arrowpanel-menuicon-padding: 8px; - --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + var(var(--arrowpanel-menuitem-padding-inline))) !important; + --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + var(--arrowpanel-menuitem-padding-inline)) !important; --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important; } From aa3dc33a4fb280f8885da8401176ba9587f1aa06 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 22 Apr 2023 06:32:52 +0900 Subject: [PATCH 18/24] Fix: Icons - BMB Search menu #687 --- css/leptonChrome.css | 3 +++ src/icons/_panel.scss | 3 +++ 2 files changed, 6 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3d7e790..ed828a3 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10449,6 +10449,9 @@ #BMB_viewBookmarksSidebar[data-l10n-args='{"isVisible":true}'] { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + #BMB_searchBookmarks { + --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); + } #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index f26b5ca..212f4c3 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -396,6 +396,9 @@ panelMenuBookmarkThisPage[starred] { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } } +#BMB_searchBookmarks { + --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); +} #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); From f568f67a27b4746277acbcf714786586652e6df8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 23 Apr 2023 02:29:53 +0900 Subject: [PATCH 19/24] Fix: Icons - Replace highlight icon #683 --- css/leptonChrome.css | 2 +- icons/highlight.svg | 3 +++ src/icons/context_menu/_content_area.scss | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 icons/highlight.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index ed828a3..429968f 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11206,7 +11206,7 @@ } #context-viewsource-highlightSyntax { /* checkbox */ - --menuitem-image: url("../icons/code.svg"); + --menuitem-image: url("../icons/highlight.svg"); } #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); diff --git a/icons/highlight.svg b/icons/highlight.svg new file mode 100644 index 0000000..74105a7 --- /dev/null +++ b/icons/highlight.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 8c938a2..8f76a99 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -9,7 +9,7 @@ #context-viewsource-highlightSyntax { /* checkbox */ - --menuitem-image: url("../icons/code.svg"); + --menuitem-image: url("../icons/highlight.svg"); } #spell-no-suggestions { From d0d15be78ba42e761546caa4a0f5115c9bf1e9e1 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 24 Apr 2023 10:42:31 +0900 Subject: [PATCH 20/24] Fix: Icons - Replace to acorn icons #213 --- css/leptonChrome.css | 5 ++++- css/leptonContent.css | 4 ++-- docs/Project_Structure.md | 2 +- icons/link.svg | 8 +++----- icons/pin-tab.svg | 4 ++-- icons/unpin-tab.svg | 4 +++- src/icons/_global_menu.scss | 2 ++ src/icons/context_menu/_tab_toolbar.scss | 1 + src/icons/layout/_menu_common.scss | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 429968f..8742556 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10566,7 +10566,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; @@ -10971,6 +10971,7 @@ #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg"); + stroke: transparent !important; } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], @@ -11975,9 +11976,11 @@ /* viewFullZoomMenu sub menu */ #menu_zoomEnlarge { --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReduce { --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReset { --menuitem-image: url("../icons/resize.svg"); diff --git a/css/leptonContent.css b/css/leptonContent.css index 05d08df..50e4963 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -252,7 +252,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; @@ -2990,7 +2990,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; diff --git a/docs/Project_Structure.md b/docs/Project_Structure.md index 3ef1f04..f0550ce 100644 --- a/docs/Project_Structure.md +++ b/docs/Project_Structure.md @@ -45,7 +45,7 @@ Most of them are made in SVG. Except for illustrations, there must be an `fill="context-fill" fill-opacity="context-fill-opacity"` property to dynamically determine color and transparency. -Icons are mainly [FirefoxUX/photon-icons](https://github.com/FirefoxUX/photon-icons) +Icons are mainly [FirefoxUX/acorn-icons](https://github.com/FirefoxUX/acorn-icons), [FirefoxUX/photon-icons](https://github.com/FirefoxUX/photon-icons) or [microsoft/fluentui-system-icons](https://github.com/microsoft/fluentui-system-icons). Although not yet used, [tabler/tabler-icons](https://github.com/tabler/tabler-icons) and [feathericons/feather](https://github.com/feathericons/feather) can also be referred to. diff --git a/icons/link.svg b/icons/link.svg index e3a0ae8..cbc15a2 100644 --- a/icons/link.svg +++ b/icons/link.svg @@ -1,8 +1,6 @@ - - - - - \ No newline at end of file + + + diff --git a/icons/pin-tab.svg b/icons/pin-tab.svg index 719eeed..2a30c3f 100644 --- a/icons/pin-tab.svg +++ b/icons/pin-tab.svg @@ -1,6 +1,6 @@ - - + + diff --git a/icons/unpin-tab.svg b/icons/unpin-tab.svg index 8acf292..f738efd 100644 --- a/icons/unpin-tab.svg +++ b/icons/unpin-tab.svg @@ -2,5 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + + diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index cd6d329..ff6f57c 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -158,9 +158,11 @@ menu.share-tab-url-item { /* viewFullZoomMenu sub menu */ #menu_zoomEnlarge { --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReduce { --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReset { --menuitem-image: url("../icons/resize.svg"); diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index b704859..f2acdcf 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -28,6 +28,7 @@ #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg"); + stroke: transparent !important; } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 2ae5264..47ede9d 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -47,7 +47,7 @@ $_initialMenus: selector.append( /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; From bd5479d7cd1e7d1395654dedb4cd2b40076658fe Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 25 Apr 2023 12:54:29 +0900 Subject: [PATCH 21/24] Add: Rounding - Square toolbar #677 --- css/leptonChrome.css | 14 +++++++++----- src/others/_findbar_floating_on_top.scss | 2 +- src/rounding/_square.scss | 8 ++++++-- src/tabbar/_one_liner.scss | 2 +- user.js | 1 + 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8742556..70ebd8c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3200,11 +3200,14 @@ border-radius: 0 !important; } } -@supports -moz-bool-pref("userChrome.rounding.square_infobox") { +@supports -moz-bool-pref("userChrome.rounding.square_toolbar") { + :root { + --uc-rounding-toolbar: 0; + } .container.infobar, .container.infobar::before, notification-message { - border-radius: 0 !important; + border-radius: var(--uc-rounding-toolbar) !important; } } @supports -moz-bool-pref("userChrome.rounding.square_field") { @@ -4263,7 +4266,7 @@ } #nav-bar { --toolbarbutton-inner-padding: 6px; /* Original: 8px */ - border-radius: var(--tab-border-radius, 4px); + border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px)); } #nav-bar, #nav-bar-customization-target { @@ -4365,7 +4368,7 @@ } #nav-bar { --toolbarbutton-inner-padding: 6px; /* Original: 8px */ - border-radius: var(--tab-border-radius, 4px); + border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px)); } #nav-bar, #nav-bar-customization-target { @@ -8768,7 +8771,8 @@ flex-direction: row-reverse; -moz-box-direction: reverse; border-width: 0 0 1px 1px; - border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius) !important; + border-radius: var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) 0 0 + var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) !important; } .findbar-container > .findbar-find-fast { padding: var(--toolbarbutton-inner-padding) 1px; diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss index e7d81c3..ff01b8a 100644 --- a/src/others/_findbar_floating_on_top.scss +++ b/src/others/_findbar_floating_on_top.scss @@ -45,7 +45,7 @@ findbar { .findbar-container { @include BoxDirection("reverse"); border-width: 0 0 1px 1px; - border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius) !important; + border-radius: var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) 0 0 var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) !important; > .findbar-find-fast { padding: var(--toolbarbutton-inner-padding) 1px; diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 9cfea74..75afd69 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -71,11 +71,15 @@ } } -@include Option("userChrome.rounding.square_infobox") { +@include Option("userChrome.rounding.square_toolbar") { + :root { + --uc-rounding-toolbar: 0; + } + .container.infobar, .container.infobar::before, notification-message { - border-radius: 0 !important; + border-radius: var(--uc-rounding-toolbar) !important; } } diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss index d65f28e..b4ccba9 100644 --- a/src/tabbar/_one_liner.scss +++ b/src/tabbar/_one_liner.scss @@ -46,7 +46,7 @@ #nav-bar { --toolbarbutton-inner-padding: 6px; /* Original: 8px */ - border-radius: var(--tab-border-radius, 4px); + border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px)); } #nav-bar, diff --git a/user.js b/user.js index 3b41bc2..e663430 100644 --- a/user.js +++ b/user.js @@ -127,6 +127,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.rounding.square_menupopup", true); // user_pref("userChrome.rounding.square_menuitem", true); // user_pref("userChrome.rounding.square_infobox", true); +// user_pref("userChrome.rounding.square_toolbar", true); // user_pref("userChrome.rounding.square_field", true); // user_pref("userChrome.rounding.square_urlView_item", true); // user_pref("userChrome.rounding.square_checklabel", true); From 0fd4efedb68ca49208ac74d3d4123479e77f524f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 26 Apr 2023 18:17:41 +0900 Subject: [PATCH 22/24] Fix: CI - `::set-output` to `$GITHUB_OUTPUT` --- .github/actions/node-setup/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/node-setup/action.yml b/.github/actions/node-setup/action.yml index 9848f55..f0f138e 100644 --- a/.github/actions/node-setup/action.yml +++ b/.github/actions/node-setup/action.yml @@ -4,9 +4,10 @@ runs: using: "composite" steps: # https://github.com/actions/cache/blob/main/examples.md#node---yarn + # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT shell: bash - name: Node cache From fea9d8cb11b533ef04df57844dd953cba9bf4ee6 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Apr 2023 16:14:11 +0900 Subject: [PATCH 23/24] Fix: Compatibility - `-moz-box`, `-moz-inline-box` to `flex`, `inline-flex` #696 --- css/leptonChrome.css | 24 +++++++++++++++++++ css/leptonContent.css | 2 ++ src/contents/_activity_stream.scss | 2 +- src/counter/_bookmark_menu.scss | 2 +- src/decoration/_animate.scss | 2 +- src/icons/_panel.scss | 10 ++++---- src/icons/layout/_panel.scss | 2 +- src/leptonContent.scss | 1 + src/library/_menubar.scss | 2 +- src/others/_findbar_floating_on_top.scss | 4 ++-- src/tab/_picture_in_picture_tab.scss | 2 +- .../clipped_tab/_always_show_tab_icon.scss | 2 +- src/tab/clipped_tab/_pinned_close_button.scss | 2 +- .../_show_close_button_at_hover.scss | 2 +- .../_photon_like_contextline.scss | 2 +- src/tab/sound_tab/_show_label.scss | 2 +- src/tabbar/_as_titlebar.scss | 2 +- src/tabbar/_multi_row.scss | 2 +- src/theme/proton_chrome/_proton_commons.scss | 6 ++--- src/utils/_moz_box.scss | 14 +++++++++++ 20 files changed, 64 insertions(+), 23 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 70ebd8c..c95be05 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2019,6 +2019,7 @@ font-weight: 600 !important; } dropmarker { + display: flex !important; display: -moz-box !important; appearance: none !important; width: 12px !important; @@ -2198,6 +2199,7 @@ font-size: inherit !important; } xul|menulist::part(dropmarker) { + display: flex; display: -moz-box; margin-block: 6px !important; } @@ -2211,6 +2213,7 @@ display: none !important; } xul|menulist::part(dropmarker) { + display: flex !important; display: -moz-box !important; margin-block: 1px !important; } @@ -3049,6 +3052,7 @@ will-change: margin-inline-start, opacity, visibility; } #sidebar-box[hidden="true"] { + display: flex !important; display: -moz-box !important; margin-inline-start: -18em; opacity: 0; @@ -5956,6 +5960,7 @@ :root:not([tabsintitlebar="true"]) #tabbrowser-tabs[hasadjacentnewtabbutton]:not([overflow="true"]) ~ #new-tab-button { + display: flex !important; display: -moz-box !important; } } @@ -6011,6 +6016,7 @@ > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button { + display: flex !important; display: -moz-box !important; } #alltabs-button, @@ -6590,6 +6596,7 @@ } @supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { .tab-context-line { + display: inline-flex !important; display: -moz-inline-box !important; height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; @@ -7173,6 +7180,7 @@ > .tab-stack > .tab-content > .tab-close-button:not([selected="true"]) { + display: inline-flex !important; display: -moz-inline-box !important; } #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button { @@ -7260,6 +7268,7 @@ } .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; order: -1 !important; -moz-box-ordinal-group: 0 !important; @@ -7279,6 +7288,7 @@ } @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.always") { .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; order: -1 !important; -moz-box-ordinal-group: 0 !important; @@ -7299,6 +7309,7 @@ } @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.background") { .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; order: -1 !important; -moz-box-ordinal-group: 0 !important; @@ -7327,6 +7338,7 @@ /** Clipped tabs - Always show tab icon ***************************************/ @supports -moz-bool-pref("userChrome.tab.always_show_tab_icon") { .tab-icon-image:not([src], [pinned], [crashed], [busy]) { + display: inline-flex !important; display: -moz-inline-box !important; } } @@ -7342,6 +7354,7 @@ /*= Sound Tab - Show Label ===================================================*/ @supports -moz-bool-pref("userChrome.tab.sound_show_label") { .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) { + display: flex !important; display: -moz-box !important; } } @@ -7519,6 +7532,7 @@ } .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after { /* Shape */ + display: inline-flex !important; display: -moz-inline-box !important; width: 14px; height: 14px; @@ -8718,6 +8732,7 @@ counter-reset: bookmark-counts 0; } menupopup[placespopup="true"] > menu.bookmark-item::after { + display: inline-flex; display: -moz-inline-box; content: "(" counter(bookmark-counts) ")"; } @@ -8754,6 +8769,7 @@ } findbar::before { content: ""; + display: flex; display: -moz-box; position: absolute; flex: 200; @@ -8779,6 +8795,7 @@ margin: 0 !important; } .findbar-container > .findbar-find-status { + display: flex; display: -moz-box; overflow: hidden; text-overflow: ellipsis; @@ -9952,6 +9969,7 @@ list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } #clearDownloadsButton > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-top: 0; margin-bottom: 0; @@ -10029,6 +10047,7 @@ } #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before { + display: inline-flex; display: -moz-inline-box; margin-inline-end: var(--arrowpanel-menuicon-padding); width: 16px; @@ -10081,6 +10100,7 @@ } /*= Panel - Main =============================================================*/ #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-inline-start: var(--arrowpanel-menuicon-padding); order: -1 !important; @@ -10206,6 +10226,7 @@ /* Default */ #fxa-manage-account-button::before { content: ""; + display: inline-flex; display: -moz-inline-box; width: 32px !important; height: 32px !important; @@ -10271,6 +10292,7 @@ /* Change Separator */ #PanelUI-fxa-menu::before { content: ""; + display: flex; display: -moz-box; border-bottom: 1px solid var(--panel-separator-color); margin: var(--panel-separator-margin); @@ -10424,6 +10446,7 @@ list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } #downloadsHistory .box-inherit.button-box { + display: inline-flex !important; display: -moz-inline-box !important; } /*= Toolbar - Overflow Menu ==================================================*/ @@ -10468,6 +10491,7 @@ list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important; } #BMB_bookmarksShowAllTop > .menu-iconic-left { + display: flex !important; display: -moz-box !important; } } diff --git a/css/leptonContent.css b/css/leptonContent.css index 50e4963..d342475 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -410,6 +410,7 @@ } #contentSearchSettingsButton::before { content: url("chrome://global/skin/icons/settings.svg") !important; + display: inline-flex; display: -moz-inline-box; /* Color */ -moz-context-properties: fill, fill-opacity !important; @@ -2171,6 +2172,7 @@ list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } #clearDownloadsButton > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-top: 0; margin-bottom: 0; diff --git a/src/contents/_activity_stream.scss b/src/contents/_activity_stream.scss index a45a1cf..19455be 100644 --- a/src/contents/_activity_stream.scss +++ b/src/contents/_activity_stream.scss @@ -159,7 +159,7 @@ #contentSearchSettingsButton::before { content: url("chrome://global/skin/icons/settings.svg") !important; - display: -moz-inline-box; + @include InlineBox; /* Color */ -moz-context-properties: fill, fill-opacity !important; diff --git a/src/counter/_bookmark_menu.scss b/src/counter/_bookmark_menu.scss index 0714b55..6f0315a 100644 --- a/src/counter/_bookmark_menu.scss +++ b/src/counter/_bookmark_menu.scss @@ -2,7 +2,7 @@ menupopup[placespopup="true"] > menu.bookmark-item > .menu-right { counter-reset: bookmark-counts 0; } menupopup[placespopup="true"] > menu.bookmark-item::after { - display: -moz-inline-box; + @include InlineBox; content: "(" counter(bookmark-counts) ")"; } diff --git a/src/decoration/_animate.scss b/src/decoration/_animate.scss index 032453f..a0b7cbb 100644 --- a/src/decoration/_animate.scss +++ b/src/decoration/_animate.scss @@ -115,7 +115,7 @@ xul|search-textbox.tabsFilter, will-change: margin-inline-start, opacity, visibility; &[hidden="true"] { - display: -moz-box !important; + @include Box(true); margin-inline-start: -18em; opacity: 0; visibility: collapse; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 212f4c3..823c66d 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -1,6 +1,6 @@ /*= Panel - Main =============================================================*/ #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { - display: -moz-inline-box !important; + @include InlineBox(true); margin-inline-start: var(--arrowpanel-menuicon-padding); @include BoxOrder(0, true); } @@ -133,7 +133,7 @@ /* Default */ #fxa-manage-account-button::before { content: ""; - display: -moz-inline-box; + @include InlineBox; width: 32px !important; height: 32px !important; border-radius: 50%; @@ -199,7 +199,7 @@ /* Change Separator */ #PanelUI-fxa-menu::before { content: ""; - display: -moz-box; + @include Box; border-bottom: 1px solid var(--panel-separator-color); margin: var(--panel-separator-margin); padding: 0; @@ -362,7 +362,7 @@ panelMenuBookmarkThisPage[starred] { list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } #downloadsHistory .box-inherit.button-box { - display: -moz-inline-box !important; + @include InlineBox(true); } /*= Toolbar - Overflow Menu ==================================================*/ @@ -412,7 +412,7 @@ panelMenuBookmarkThisPage[starred] { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important; } #BMB_bookmarksShowAllTop > .menu-iconic-left { - display: -moz-box !important; + @include Box(true); } } diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index 49c1254..a117e10 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -44,7 +44,7 @@ #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before { - display: -moz-inline-box; + @include InlineBox; margin-inline-end: var(--arrowpanel-menuicon-padding); width: 16px; height: 16px; diff --git a/src/leptonContent.scss b/src/leptonContent.scss index abe1704..1c85784 100644 --- a/src/leptonContent.scss +++ b/src/leptonContent.scss @@ -4,6 +4,7 @@ @use "utils/accent_color" as *; @use "utils/native_menu" as *; @use "utils/moz_document" as *; +@use "utils/moz_box" as *; @use "utils/proton_elements" as Proton; @use "sass:selector"; diff --git a/src/library/_menubar.scss b/src/library/_menubar.scss index 9fd615f..8899c3b 100644 --- a/src/library/_menubar.scss +++ b/src/library/_menubar.scss @@ -24,7 +24,7 @@ list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } #clearDownloadsButton > .toolbarbutton-icon { - display: -moz-inline-box !important; + @include InlineBox(true); margin-top: 0; margin-bottom: 0; margin-inline-start: 0; diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss index ff01b8a..d1268ae 100644 --- a/src/others/_findbar_floating_on_top.scss +++ b/src/others/_findbar_floating_on_top.scss @@ -27,7 +27,7 @@ findbar { &::before { content:""; - display: -moz-box; + @include Box; position: absolute; @include BoxFlex(200); } @@ -52,7 +52,7 @@ findbar { margin: 0 !important; } > .findbar-find-status { - display: -moz-box; + @include Box; overflow: hidden; text-overflow: ellipsis; @include BoxFlex(1); diff --git a/src/tab/_picture_in_picture_tab.scss b/src/tab/_picture_in_picture_tab.scss index 9bf4b06..a68c88b 100644 --- a/src/tab/_picture_in_picture_tab.scss +++ b/src/tab/_picture_in_picture_tab.scss @@ -4,7 +4,7 @@ } .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after { /* Shape */ - display: -moz-inline-box !important; + @include InlineBox(true); width: 14px; height: 14px; background-size: 14px; diff --git a/src/tab/clipped_tab/_always_show_tab_icon.scss b/src/tab/clipped_tab/_always_show_tab_icon.scss index 3fb4c29..489ee87 100644 --- a/src/tab/clipped_tab/_always_show_tab_icon.scss +++ b/src/tab/clipped_tab/_always_show_tab_icon.scss @@ -1,3 +1,3 @@ .tab-icon-image:not([src], [pinned], [crashed], [busy]) { - display: -moz-inline-box !important; + @include InlineBox(true); } diff --git a/src/tab/clipped_tab/_pinned_close_button.scss b/src/tab/clipped_tab/_pinned_close_button.scss index 8bcb3b2..e971b03 100644 --- a/src/tab/clipped_tab/_pinned_close_button.scss +++ b/src/tab/clipped_tab/_pinned_close_button.scss @@ -11,7 +11,7 @@ //-- Mixin --------------------------------------------------------------------- @mixin pinnedCloseButtonShow($prefix: "") { #{$prefix}:not([busy]) .tab-close-button { - display: -moz-box !important; + @include Box(true); @include BoxOrder(0, true); /* Looks like hover */ diff --git a/src/tab/clipped_tab/_show_close_button_at_hover.scss b/src/tab/clipped_tab/_show_close_button_at_hover.scss index 7f82d84..8b3e8fe 100644 --- a/src/tab/clipped_tab/_show_close_button_at_hover.scss +++ b/src/tab/clipped_tab/_show_close_button_at_hover.scss @@ -24,7 +24,7 @@ > .tab-stack > .tab-content > .tab-close-button:not([selected="true"]) { - display: -moz-inline-box !important; + @include InlineBox(true); } @include _closeButtonAtHover; diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index 13d7644..c98878d 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -1,5 +1,5 @@ .tab-context-line { - display: -moz-inline-box !important; + @include InlineBox(true); height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } diff --git a/src/tab/sound_tab/_show_label.scss b/src/tab/sound_tab/_show_label.scss index e288020..8f9d485 100644 --- a/src/tab/sound_tab/_show_label.scss +++ b/src/tab/sound_tab/_show_label.scss @@ -1,3 +1,3 @@ .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]){ - display: -moz-box !important; + @include Box(true); } diff --git a/src/tabbar/_as_titlebar.scss b/src/tabbar/_as_titlebar.scss index 5eb1031..bd0c6cd 100644 --- a/src/tabbar/_as_titlebar.scss +++ b/src/tabbar/_as_titlebar.scss @@ -82,6 +82,6 @@ spacer:is([part="overflow-start-indicator"], [part="overflow-end-indicator"]), @include Option("browser.tabs.tabmanager.enabled") { :root:not([tabsintitlebar="true"]) #tabbrowser-tabs:not([overflow="true"], [hashiddentabs]) ~ #alltabs-button, :root:not([tabsintitlebar="true"]) #tabbrowser-tabs[hasadjacentnewtabbutton]:not([overflow="true"]) ~ #new-tab-button { - display: -moz-box !important; + @include Box(true); } } diff --git a/src/tabbar/_multi_row.scss b/src/tabbar/_multi_row.scss index 7fe90cf..d136f51 100644 --- a/src/tabbar/_multi_row.scss +++ b/src/tabbar/_multi_row.scss @@ -65,7 +65,7 @@ See the above repository for updates as well as full license text. */ margin-bottom: 0 !important; } #tabbrowser-tabs[hasadjacentnewtabbutton][overflow="true"] > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button { - display: -moz-box !important; + @include Box(true); } #alltabs-button, diff --git a/src/theme/proton_chrome/_proton_commons.scss b/src/theme/proton_chrome/_proton_commons.scss index 1d246a2..6cc05ce 100644 --- a/src/theme/proton_chrome/_proton_commons.scss +++ b/src/theme/proton_chrome/_proton_commons.scss @@ -284,7 +284,7 @@ } dropmarker { - display: -moz-box !important; + @include Box(true); appearance: none !important; width: 12px !important; height: 12px !important; @@ -486,7 +486,7 @@ font-size: inherit !important; } xul|menulist::part(dropmarker) { - display: -moz-box; + @include Box; margin-block: 6px !important; } xul|menulist:-moz-focusring::part(label-box) { @@ -501,7 +501,7 @@ } xul|menulist::part(dropmarker) { - display: -moz-box !important; + @include Box(true); margin-block: 1px !important; } diff --git a/src/utils/_moz_box.scss b/src/utils/_moz_box.scss index b095e06..7ff779e 100644 --- a/src/utils/_moz_box.scss +++ b/src/utils/_moz_box.scss @@ -110,3 +110,17 @@ -moz-box-direction: reverse $important; } } + +@mixin Box($important: false) { + $important: _important($important); + + display: flex $important; + display: -moz-box $important; +} + +@mixin InlineBox($important: false) { + $important: _important($important); + + display: inline-flex $important; + display: -moz-inline-box $important; +} From ef708145be2f4f38c53ad6e06ed121ffbd4834ea Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 2 May 2023 23:13:55 +0900 Subject: [PATCH 24/24] Doc: CREDITS - Upadate sponsors --- CREDITS | 3 +++ README.org | 1 + 2 files changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index 5180b22..6d832b4 100644 --- a/CREDITS +++ b/CREDITS @@ -43,6 +43,9 @@ W: https://github.com/nikkehtine N: OSS.kr W: https://www.oss.kr/ +N: ZachKnife1 +W: https://github.com/ZachKnife1 + ---------- Contributors diff --git a/README.org b/README.org index 623c73e..4500b91 100644 --- a/README.org +++ b/README.org @@ -201,6 +201,7 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[https://www.oss.kr/][https://user-images.githubusercontent.com/25581533/203210367-9f2eed69-666a-4218-acde-128892aa09d8.png]] [[https://github.com/ojaha065][@@html:@@]] [[https://github.com/DPS0340][@@html:@@]] +[[https://github.com/ZachKnife1][@@html:@@]] [[https://github.com/kanlukasz][@@html:@@]] [[https://github.com/nikkehtine][@@html:@@]]