From 13d6e29c90d17391e560da13b13dff5aef258ee3 Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:46:07 +0500 Subject: [PATCH 01/32] Add: Rounding - Close tab button --- css/leptonChrome.css | 1 + src/rounding/_square.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8c8358d..e26b417 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3064,6 +3064,7 @@ .urlbarView-button, .urlbarView-tip-button, .urlbarView-action, + .tab-close-button, toolbarbutton.bookmark-item:not(.subviewbutton), #sidebar-switcher-target { --toolbarbutton-border-radius: 0; /* Original: 4px */ diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 9c86f15..76361c9 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -15,6 +15,7 @@ .urlbarView-button, .urlbarView-tip-button, .urlbarView-action, + .tab-close-button, toolbarbutton.bookmark-item:not(.subviewbutton), #sidebar-switcher-target { --toolbarbutton-border-radius: 0; /* Original: 4px */ From a45bdb1c48618eceab44d8ce86470fdd84f600e5 Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Sat, 7 Jan 2023 19:41:43 +0500 Subject: [PATCH 02/32] Add: Rounding - Dialog --- css/leptonChrome.css | 5 +++++ src/rounding/_square.scss | 6 ++++++ user.js | 1 + 3 files changed, 12 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e26b417..505ff9b 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3082,6 +3082,11 @@ --tab-border-radius: var(--toolbarbutton-border-radius); } } +@supports -moz-bool-pref("userChrome.rounding.square_dialog") { + .dialogBox { + border-radius: 0 !important; + } +} @supports -moz-bool-pref("userChrome.rounding.square_panel") { :root { --arrowpanel-border-radius: 0 !important; diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 76361c9..4c1181b 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -35,6 +35,12 @@ } } +@include Option("userChrome.rounding.square_dialog") { + .dialogBox { + border-radius: 0 !important; + } +} + @include Option("userChrome.rounding.square_panel") { :root { --arrowpanel-border-radius: 0 !important; diff --git a/user.js b/user.js index d00aa34..c649538 100644 --- a/user.js +++ b/user.js @@ -120,6 +120,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.combined.sub_button.as_normal", true); // user_pref("userChrome.rounding.square_button", true); +// user_pref("userChrome.rounding.square_dialog", true); // user_pref("userChrome.rounding.square_panel", true); // user_pref("userChrome.rounding.square_panelitem", true); // user_pref("userChrome.rounding.square_menupopup", true); From 64c453b5054f10d95691b2938cefddc01f147f51 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 11 Jan 2023 09:49:42 +0900 Subject: [PATCH 03/32] Clean: CI - Setup action separated --- .github/actions/node-setup/action.yml | 29 +++++++++++++++++++++++++++ .github/workflows/ci.yml | 17 ++-------------- .github/workflows/release.yml | 5 +++-- 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 .github/actions/node-setup/action.yml diff --git a/.github/actions/node-setup/action.yml b/.github/actions/node-setup/action.yml new file mode 100644 index 0000000..f2dd690 --- /dev/null +++ b/.github/actions/node-setup/action.yml @@ -0,0 +1,29 @@ +name: "Setup" + +runs: + using: "composite" + steps: + - name: Checkout + uses: actions/checkout@v3 + + # https://github.com/actions/cache/blob/main/examples.md#node---yarn + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo "::set-output name=dir::$(yarn cache dir)" + + - name: Node cache + id: node-cache + uses: actions/cache@v3 + with: + path: | + ${{ steps.yarn-cache-dir-path.outputs.dir }} + "**/node_modules" + key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') } + ${{ runner.os }}-node- + + - name: Package Install + if: steps.node-cache.outputs.cache-hit != 'true' + run: yarn install + shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06d708a..d1c5ed8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,21 +20,8 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Node cache - id: node-cache - uses: actions/cache@v2 - with: - path: node_modules - key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-node- - - - name: Package Install - if: steps.node-cache.outputs.cache-hit != 'true' - run: yarn install + - name: Setup + uses: ./.github/actions/node-setup - name: Build run: yarn build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9788e49..4f637e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,8 @@ jobs: sync-branches: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + fetch-depth: 0 - name: Merge master -> photon-style uses: devmasx/merge-branch@1.4.0 @@ -38,7 +39,7 @@ jobs: - name: "Lepton-Proton-Style" branch: "proton-style" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ matrix.branch }} From a404a468049862f38c0ffc9ea6f57c49de56ec40 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 15 Jan 2023 18:00:16 +0900 Subject: [PATCH 04/32] Fix: Padding - Panel's all tabs item margin #576 --- css/leptonChrome.css | 3 +++ src/padding/_panel.scss | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 505ff9b..4c7d74c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3774,6 +3774,9 @@ --arrowpanel-menuitem-padding-block: 8px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 8px !important; /* Original: 8px */ } + .all-tabs-item { + margin: var(--arrowpanel-menuitem-margin) !important; + } @supports not -moz-bool-pref("userChrome.icon.disabled") { @supports not -moz-bool-pref("userChrome.icon.panel") { .subviewbutton { diff --git a/src/padding/_panel.scss b/src/padding/_panel.scss index 8d1fde8..7ae6485 100644 --- a/src/padding/_panel.scss +++ b/src/padding/_panel.scss @@ -15,6 +15,10 @@ --arrowpanel-menuitem-padding-inline: 8px !important; /* Original: 8px */ } +.all-tabs-item { + margin: var(--arrowpanel-menuitem-margin) !important; +} + @include NotOption("userChrome.icon.disabled") { @include NotOption("userChrome.icon.panel") { .subviewbutton { From 8786d2a6763c52b7f3ab3aeb9b1d8e5a57a25346 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 15 Jan 2023 18:03:40 +0900 Subject: [PATCH 05/32] Fix: CI - checkout --- .github/actions/node-setup/action.yml | 4 +--- .github/workflows/ci.yml | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/node-setup/action.yml b/.github/actions/node-setup/action.yml index f2dd690..a98ffb1 100644 --- a/.github/actions/node-setup/action.yml +++ b/.github/actions/node-setup/action.yml @@ -3,13 +3,11 @@ name: "Setup" runs: using: "composite" steps: - - name: Checkout - uses: actions/checkout@v3 - # https://github.com/actions/cache/blob/main/examples.md#node---yarn - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" + shell: bash - name: Node cache id: node-cache diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1c5ed8..853e83f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Setup uses: ./.github/actions/node-setup From 8d3371239fe2d1e71393a911017b1a063912c5ec Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 16 Jan 2023 18:18:15 +0900 Subject: [PATCH 06/32] Fix: Autohide - toolbarbutton hide size #568 --- css/leptonChrome.css | 2 +- src/autohide/_index.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 4c7d74c..f4193f7 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8732,7 +8732,7 @@ @supports -moz-bool-pref("userChrome.autohide.back_button") or -moz-bool-pref("userChrome.autohide.forward_button") { :root { --uc-toolbarbutton-hide-size: calc( - -1 * (16px + (2 * var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding))) + -1 * (16px + (2 * (var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding)))) ); } } diff --git a/src/autohide/_index.scss b/src/autohide/_index.scss index 805c44e..40f8d71 100644 --- a/src/autohide/_index.scss +++ b/src/autohide/_index.scss @@ -1,6 +1,6 @@ @include Option("userChrome.autohide.back_button", "userChrome.autohide.forward_button") { :root { - --uc-toolbarbutton-hide-size: calc(-1 * (16px + (2 * var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding)))); + --uc-toolbarbutton-hide-size: calc(-1 * (16px + (2 * (var(--toolbarbutton-outer-padding) + var(--toolbarbutton-inner-padding))))); } } From 7f5f28b8c2d20bf64e32500379609df6600606de Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 17 Jan 2023 22:09:12 +0900 Subject: [PATCH 07/32] Fix: Autohide - Apply at brower.xhtml #575 --- css/leptonChrome.css | 53 +++++++++++++++++++++------------------- src/autohide/_index.scss | 13 ++++++---- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index f4193f7..aba596e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8736,35 +8736,38 @@ ); } } -@supports -moz-bool-pref("userChrome.autohide.back_button") { - #back-button[disabled="true"] { - margin-left: var(--uc-toolbarbutton-hide-size) !important; - opacity: 0 !important; - pointer-events: none; - } - @media (prefers-reduced-motion: no-preference) { - #back-button { - transition-property: background-color, opacity, margin-left !important; - } +@-moz-document url("chrome://browser/content/browser.xhtml") +{ + @supports -moz-bool-pref("userChrome.autohide.back_button") { #back-button[disabled="true"] { - transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), - margin-left 0.5s ease !important; + margin-left: var(--uc-toolbarbutton-hide-size) !important; + opacity: 0 !important; + pointer-events: none; + } + @media (prefers-reduced-motion: no-preference) { + #back-button { + transition-property: background-color, opacity, margin-left !important; + } + #back-button[disabled="true"] { + transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), + margin-left 0.5s ease !important; + } } } -} -@supports -moz-bool-pref("userChrome.autohide.forward_button") { - #forward-button[disabled="true"] { - margin-left: var(--uc-toolbarbutton-hide-size) !important; - opacity: 0 !important; - pointer-events: none; - } - @media (prefers-reduced-motion: no-preference) { - #forward-button { - transition-property: background-color, opacity, margin-left !important; - } + @supports -moz-bool-pref("userChrome.autohide.forward_button") { #forward-button[disabled="true"] { - transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), - margin-left 0.5s ease !important; + margin-left: var(--uc-toolbarbutton-hide-size) !important; + opacity: 0 !important; + pointer-events: none; + } + @media (prefers-reduced-motion: no-preference) { + #forward-button { + transition-property: background-color, opacity, margin-left !important; + } + #forward-button[disabled="true"] { + transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), + margin-left 0.5s ease !important; + } } } } diff --git a/src/autohide/_index.scss b/src/autohide/_index.scss index 40f8d71..4fcc990 100644 --- a/src/autohide/_index.scss +++ b/src/autohide/_index.scss @@ -4,11 +4,14 @@ } } -@include Option("userChrome.autohide.back_button") { - @import "back_button"; -} -@include Option("userChrome.autohide.forward_button") { - @import "forward_button"; +@include moz-document(url "chrome://browser/content/browser.xhtml") +{ + @include Option("userChrome.autohide.back_button") { + @import "back_button"; + } + @include Option("userChrome.autohide.forward_button") { + @import "forward_button"; + } } @include Option("userChrome.autohide.page_action") { @import "page_action"; From f0cb60ffb9ba03bc6eb1779bc5c1950bf0be6a33 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Tue, 17 Jan 2023 23:13:11 +0900 Subject: [PATCH 08/32] Fix: CI - restore key --- .github/actions/node-setup/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/node-setup/action.yml b/.github/actions/node-setup/action.yml index a98ffb1..4941077 100644 --- a/.github/actions/node-setup/action.yml +++ b/.github/actions/node-setup/action.yml @@ -18,7 +18,6 @@ runs: "**/node_modules" key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} restore-keys: | - ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') } ${{ runner.os }}-node- - name: Package Install From 39929f1b1e4c5d1509280f34c017e6c429535e04 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 20 Jan 2023 17:48:49 +0900 Subject: [PATCH 09/32] Fix: Autohide - Buttons show at customizing page #579 --- css/leptonChrome.css | 4 ++-- src/autohide/_back_button.scss | 2 +- src/autohide/_forward_button.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index aba596e..434ae88 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8739,7 +8739,7 @@ @-moz-document url("chrome://browser/content/browser.xhtml") { @supports -moz-bool-pref("userChrome.autohide.back_button") { - #back-button[disabled="true"] { + :root:not([customizing="true"]) #back-button[disabled="true"] { margin-left: var(--uc-toolbarbutton-hide-size) !important; opacity: 0 !important; pointer-events: none; @@ -8755,7 +8755,7 @@ } } @supports -moz-bool-pref("userChrome.autohide.forward_button") { - #forward-button[disabled="true"] { + :root:not([customizing="true"]) #forward-button[disabled="true"] { margin-left: var(--uc-toolbarbutton-hide-size) !important; opacity: 0 !important; pointer-events: none; diff --git a/src/autohide/_back_button.scss b/src/autohide/_back_button.scss index 21cc162..d817a08 100644 --- a/src/autohide/_back_button.scss +++ b/src/autohide/_back_button.scss @@ -1,4 +1,4 @@ -#back-button[disabled="true"] { +:root:not([customizing="true"]) #back-button[disabled="true"] { margin-left: var(--uc-toolbarbutton-hide-size) !important; opacity: 0 !important; pointer-events: none; diff --git a/src/autohide/_forward_button.scss b/src/autohide/_forward_button.scss index 4e6e240..ddb47b0 100644 --- a/src/autohide/_forward_button.scss +++ b/src/autohide/_forward_button.scss @@ -1,4 +1,4 @@ -#forward-button[disabled="true"] { + :root:not([customizing="true"]) #forward-button[disabled="true"] { margin-left: var(--uc-toolbarbutton-hide-size) !important; opacity: 0 !important; pointer-events: none; From dbd8b1d06179fbf295afecf99d5b1afdd52c65fa Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 21 Jan 2023 10:09:01 +0900 Subject: [PATCH 10/32] Doc: CREDITS - Add sponsor --- CREDITS | 4 ++++ README.org | 1 + 2 files changed, 5 insertions(+) diff --git a/CREDITS b/CREDITS index b5a5812..8bb4ea1 100644 --- a/CREDITS +++ b/CREDITS @@ -26,6 +26,10 @@ N: Jani Haiko E: haiko.jani@gmail.com W: https://github.com/ojaha065 +N: Jiho Lee +E: optional.int@kakao.com +W: https://github.com/DPS0340 + N: kanlukasz W: https://github.com/kanlukasz diff --git a/README.org b/README.org index 5940485..c09c47a 100644 --- a/README.org +++ b/README.org @@ -194,6 +194,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/kanlukasz][@@html:@@]] [[https://github.com/nikkehtine][@@html:@@]] From 081f8b09d577906c2fa742fa7750f78f3af2f790 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 22 Jan 2023 11:32:21 +0900 Subject: [PATCH 11/32] Fix: Icons - Menu size at Win10 native menu #580 --- css/leptonChrome.css | 11 +++++++++++ css/leptonContent.css | 11 +++++++++++ src/icons/layout/_menu_common.scss | 16 ++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 434ae88..3c28a85 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10501,6 +10501,17 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + .menuitem-iconic > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + .menu-accel, + .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } } :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup diff --git a/css/leptonContent.css b/css/leptonContent.css index 6ad5f53..a2e4936 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2812,6 +2812,17 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + .menuitem-iconic > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + .menu-accel, + .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } } menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 62a3f35..84e2545 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -97,11 +97,23 @@ $_initialMenus: selector.append( --context-menu-background-padding: 1em; --context-menu-text-padding: 24px; /* 16px + 8px */ --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding)); - - @include Win10_NativeMenu() { + } + @include Win10_NativeMenu() { + :root { --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + + .menuitem-iconic > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + .menu-accel, .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } } } @mixin _layout_init_win10() { From 8957841e8f7b5f859924daa1cba57097fe1e8346 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 23 Jan 2023 05:44:40 +0900 Subject: [PATCH 12/32] Fix: Rounding - Square button at menubar menu #584 --- css/leptonChrome.css | 3 ++- src/rounding/_square.scss | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3c28a85..35cec33 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3071,7 +3071,8 @@ } button, findbar toolbarbutton, - .notification-button { + .notification-button, + #main-menubar > menu { border-radius: 0 !important; } } diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 4c1181b..d196c16 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -23,7 +23,8 @@ button, findbar toolbarbutton, - .notification-button { + .notification-button, + #main-menubar > menu { border-radius: 0 !important; } } From 04ab7aec8ce7ce844d0d3a8bc69e12458f39f45c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 24 Jan 2023 02:54:16 +0900 Subject: [PATCH 13/32] Fix: Icons - Menu text padding at Win11 native menu #580 --- css/leptonChrome.css | 6 ++++++ css/leptonContent.css | 6 ++++++ src/icons/layout/_menu_common.scss | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 35cec33..dfffe82 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10513,6 +10513,12 @@ box-sizing: content-box; min-height: 16px; } + .menu-accel, + .menu-iconic-accel, + .menu-text, + .menu-iconic-text { + padding-block: 0 !important; + } } :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup diff --git a/css/leptonContent.css b/css/leptonContent.css index a2e4936..effcb9e 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2823,6 +2823,12 @@ box-sizing: content-box; min-height: 16px; } + .menu-accel, + .menu-iconic-accel, + .menu-text, + .menu-iconic-text { + padding-block: 0 !important; + } } menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 84e2545..d444cbd 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -114,6 +114,10 @@ $_initialMenus: selector.append( box-sizing: content-box; min-height: 16px; } + .menu-accel, .menu-iconic-accel, + .menu-text, .menu-iconic-text { + padding-block: 0 !important; + } } } @mixin _layout_init_win10() { From 721130764e919d17547ddb6d908a536367528918 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 24 Jan 2023 02:56:28 +0900 Subject: [PATCH 14/32] Fix: CI - Install packages --- .github/actions/node-setup/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/node-setup/action.yml b/.github/actions/node-setup/action.yml index 4941077..9848f55 100644 --- a/.github/actions/node-setup/action.yml +++ b/.github/actions/node-setup/action.yml @@ -21,6 +21,5 @@ runs: ${{ runner.os }}-node- - name: Package Install - if: steps.node-cache.outputs.cache-hit != 'true' run: yarn install shell: bash From 0ce6bda237f7eb49b29407edc0f1b1913dacff96 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 24 Jan 2023 22:34:24 +0900 Subject: [PATCH 15/32] Fix: Icons - Menu text padding at Win11 native #580 --- css/leptonChrome.css | 1 + css/leptonContent.css | 1 + src/icons/layout/_menu_common.scss | 13 ++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index dfffe82..6f009e2 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10502,6 +10502,7 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + .menu-iconic > .menu-iconic-left, .menuitem-iconic > .menu-iconic-left { appearance: none !important; padding-block: 0 !important; diff --git a/css/leptonContent.css b/css/leptonContent.css index effcb9e..11f6586 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2812,6 +2812,7 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + .menu-iconic > .menu-iconic-left, .menuitem-iconic > .menu-iconic-left { appearance: none !important; padding-block: 0 !important; diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index d444cbd..f4c9827 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -104,11 +104,14 @@ $_initialMenus: selector.append( --menu-background-padding-default: 0px; } - .menuitem-iconic > .menu-iconic-left { - appearance: none !important; - padding-block: 0 !important; - padding-inline-start: 5px !important; - margin-inline-end: 8px !important; + .menu-iconic, + .menuitem-iconic { + > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } } .menu-accel, .menu-iconic-accel { box-sizing: content-box; From ebc37342ee6140bd87f9b8b64bb4c0ebdc3b5ef4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 24 Jan 2023 22:38:55 +0900 Subject: [PATCH 16/32] Fix: Icons - Win10 native menu padding #580 --- src/icons/layout/_menu_common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index f4c9827..6b8b7a6 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -100,7 +100,7 @@ $_initialMenus: selector.append( } @include Win10_NativeMenu() { :root { - --context-menu-background-padding: 3px; + --context-menu-background-padding: 5px; --menu-background-padding-default: 0px; } From 5a2f2b9776d153d4632805592df18b0ed1934a97 Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:58:52 +0500 Subject: [PATCH 17/32] Add: Rounding - Square options in about pages --- css/leptonContent.css | 103 +++++++++++++++++- src/contents/_rounding.scss | 99 +++++++++++++++++ .../proton_contents/_proton_commons.scss | 8 ++ src/leptonContent.scss | 3 + 4 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 src/contents/_rounding.scss diff --git a/css/leptonContent.css b/css/leptonContent.css index effcb9e..37ca721 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -313,8 +313,7 @@ width: 100% !important; /* Original: 48px */ height: 100% !important; /* Original: 48px */ } - } - /** Activity Stream - Animate ***********************************************/ + } /** Activity Stream - Animate ***********************************************/ @supports -moz-bool-pref("userContent.newTab.animate") { @media (prefers-reduced-motion: no-preference) { :root { @@ -1708,6 +1707,13 @@ /* Ensure font-size isn't overridden by widget styling (e.g. in forms.css) */ font-size: 1em !important; } + @supports -moz-bool-pref("userChrome.rounding.square_button") { + button, + select, + input[type="color"] { + border-radius: 0 !important; + } + } button { font-weight: 600 !important; /* Use the same margin of other elements for the alignment */ @@ -1781,6 +1787,11 @@ margin-inline: 0 6px !important; flex-shrink: 0 !important; /* avoid shrinking inside flex container */ } + @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { + input[type="checkbox"] { + border-radius: 0 !important; + } + } input[type="checkbox"]:enabled:hover { background-color: var(--checkbox-unchecked-hover-bgcolor) !important; } @@ -2712,6 +2723,94 @@ } } } +/** Rounding ******************************************************************/ +@supports -moz-bool-pref("userChrome.rounding.square_button") { + @-moz-document url-prefix("about:") { + button, + .close-icon, + .action-icon::before, + #categories > .category, + .sidebar-footer-link { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("about:debugging") { + .sidebar-item { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("chrome://browser/content/places/places.xhtml"), url-prefix("about:downloads") + { + .downloadButton > .button-box { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("about:protections") { + #manage-protections, + #sign-up-for-monitor-link, + #get-proxy-extension-link, + #get-vpn-link, + #vpn-banner-link, + .monitor-partial-breaches-link-wrapper, + .monitor-breaches-link-wrapper { + border-radius: 0 !important; + } + } +} +@supports -moz-bool-pref("userChrome.rounding.square_dialog") { + @-moz-document url-prefix("about:") { + .dialogBox { + border-radius: 0 !important; + } + } + @-moz-document url("about:home"), url("about:newtab") { + .modal { + border-radius: 0 !important; + } + } +} +@supports -moz-bool-pref("userChrome.rounding.square_checklabel") { + @-moz-document url-prefix("about:") { + input[type="checkbox"]:not(.toggle-button), + .checkbox-check { + border-radius: 0 !important; + } + } +} +@supports -moz-bool-pref("userChrome.rounding.square_field") { + @-moz-document url-prefix("about:") { + input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), + textarea, + select, + menulist, + search-textbox { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("about:debugging") { + .default-input { + border-radius: 0 !important; + } + } + @-moz-document url("about:home"), url("about:newtab") { + .search-wrapper .search-handoff-button, + .search-wrapper input { + border-radius: 0 !important; + } + } +} +@supports -moz-bool-pref("userChrome.rounding.square_menupopup") { + @-moz-document url-prefix("about:preferences") { + menupopup { + --panel-border-radius: 0 !important; + } + } + @-moz-document url("about:home"), url("about:newtab") { + .context-menu { + border-radius: 0 !important; + } + } +} /** Monospace *****************************************************************/ @supports -moz-bool-pref("userContent.page.monospace") { @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss new file mode 100644 index 0000000..f2590ae --- /dev/null +++ b/src/contents/_rounding.scss @@ -0,0 +1,99 @@ +@include Option("userChrome.rounding.square_button") { + @include moz-document(url-prefix "about:") { + button, + .close-icon, + .action-icon::before, + #categories > .category, + .sidebar-footer-link { + border-radius: 0 !important; + } + } + + @include moz-document(url-prefix "about:debugging") { + .sidebar-item { + border-radius: 0 !important; + } + } + + @include moz-document(url-prefix "chrome://browser/content/places/places.xhtml", url-prefix "about:downloads") { + .downloadButton > .button-box { + border-radius: 0 !important; + } + } + + @include moz-document(url-prefix "about:protections") { + #manage-protections, + #sign-up-for-monitor-link, + #get-proxy-extension-link, + #get-vpn-link, + #vpn-banner-link, + .monitor-partial-breaches-link-wrapper, + .monitor-breaches-link-wrapper { + border-radius: 0 !important; + } + } +} + +@include Option("userChrome.rounding.square_dialog") { + @include moz-document(url-prefix "about:") { + .dialogBox { + border-radius: 0 !important; + } + } + + @include moz-document(url "about:home", url "about:newtab") { + .modal { + border-radius: 0 !important; + } + } +} + +@include Option("userChrome.rounding.square_checklabel") { + @include moz-document(url-prefix "about:") { + input[type="checkbox"]:not(.toggle-button), + .checkbox-check { + border-radius: 0 !important; + } + } +} + +@include Option("userChrome.rounding.square_field") { + @include moz-document(url-prefix "about:") { + input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), + textarea, + select, + menulist, + search-textbox { + border-radius: 0 !important; + } + } + + @include moz-document(url-prefix "about:debugging") { + .default-input { + border-radius: 0 !important; + } + } + + @include moz-document(url "about:home", url "about:newtab") { + .search-wrapper { + .search-handoff-button, + input { + border-radius: 0 !important; + } + } + } +} + +@include Option("userChrome.rounding.square_menupopup") { + @include moz-document(url-prefix "about:preferences") { + menupopup { + --panel-border-radius: 0 !important; + } + } + + @include moz-document(url "about:home", url "about:newtab") { + .context-menu { + border-radius: 0 !important; + } + } +} diff --git a/src/contents/proton_contents/_proton_commons.scss b/src/contents/proton_contents/_proton_commons.scss index 9be371a..ee2e7b6 100644 --- a/src/contents/proton_contents/_proton_commons.scss +++ b/src/contents/proton_contents/_proton_commons.scss @@ -70,6 +70,10 @@ margin: 4px 8px !important; /* Ensure font-size isn't overridden by widget styling (e.g. in forms.css) */ font-size: 1em !important; + + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; + } } button { font-weight: 600 !important; @@ -144,6 +148,10 @@ border-radius: 2px !important; margin-inline: 0 6px !important; flex-shrink: 0 !important; /* avoid shrinking inside flex container */ + + @include Option("userChrome.rounding.square_checklabel") { + border-radius: 0 !important; + } } input[type="checkbox"]:enabled:hover { background-color: var(--checkbox-unchecked-hover-bgcolor) !important; diff --git a/src/leptonContent.scss b/src/leptonContent.scss index 2242f48..70259b8 100644 --- a/src/leptonContent.scss +++ b/src/leptonContent.scss @@ -35,6 +35,9 @@ @import "contents/proton_contents"; } +/** Rounding ******************************************************************/ +@import "contents/rounding"; + /** Monospace *****************************************************************/ @include Option("userContent.page.monospace") { @import "contents/monospace"; From f1a5fd4357a7ec3d0eb6962a2686543b3a448135 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 26 Jan 2023 06:38:28 +0900 Subject: [PATCH 18/32] Clean: Build - files --- css/leptonChrome.css | 2 +- css/leptonContent.css | 5 +++-- .../{_show_bookmarkbar.css => _show_bookmarkbar.scss} | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename src/fullscreen/{_show_bookmarkbar.css => _show_bookmarkbar.scss} (100%) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 6f009e2..f7d7864 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10499,7 +10499,7 @@ } @media not (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding: 3px; + --context-menu-background-padding: 5px; --menu-background-padding-default: 0px; } .menu-iconic > .menu-iconic-left, diff --git a/css/leptonContent.css b/css/leptonContent.css index ff533ce..251ec9a 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -313,7 +313,8 @@ width: 100% !important; /* Original: 48px */ height: 100% !important; /* Original: 48px */ } - } /** Activity Stream - Animate ***********************************************/ + } + /** Activity Stream - Animate ***********************************************/ @supports -moz-bool-pref("userContent.newTab.animate") { @media (prefers-reduced-motion: no-preference) { :root { @@ -2908,7 +2909,7 @@ } @media not (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding: 3px; + --context-menu-background-padding: 5px; --menu-background-padding-default: 0px; } .menu-iconic > .menu-iconic-left, diff --git a/src/fullscreen/_show_bookmarkbar.css b/src/fullscreen/_show_bookmarkbar.scss similarity index 100% rename from src/fullscreen/_show_bookmarkbar.css rename to src/fullscreen/_show_bookmarkbar.scss From c4673876b929d18827ebfa6426f33762ed8ca21a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 27 Jan 2023 09:29:10 +0900 Subject: [PATCH 19/32] Add: Icons - Bookmark menu sidebar icon #594 --- css/leptonChrome.css | 24 ++++++++++++++++++------ src/icons/_global_menu.scss | 3 ++- src/icons/_index.scss | 10 ++++++++++ src/icons/_panel.scss | 10 +++++----- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index f7d7864..7b1c8ba 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9810,6 +9810,16 @@ } } /** Panel - Icons *************************************************************/ + :root { + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); + } + @supports selector(:has(a)) { + :root:has(#sidebar-box[positionend="true"]) { + --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg"); + } + } @supports -moz-bool-pref("userChrome.icon.panel") { /*= Padding ==================================================================*/ :root { @@ -10270,6 +10280,12 @@ list-style-image: url("chrome://global/skin/icons/settings.svg"); } /*= BMB_bookmarksPopup =======================================================*/ + #BMB_viewBookmarksSidebar { + --menuitem-image: var(--uc-sidebar-icon); + } + #BMB_viewBookmarksSidebar[data-l10n-args='{"isVisible":true}'] { + --menuitem-image: url("chrome://global/skin/icons/close.svg"); + } #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); @@ -10332,11 +10348,7 @@ list-style-image: url("chrome://browser/skin/tab.svg"); } #sidebar-reverse-position { - list-style-image: url("chrome://browser/skin/sidebars-right.svg"); - } - #sidebar-box[positionend="true"] #sidebar-reverse-position { - /* Can't apply this. shadow dom */ - list-style-image: url("chrome://browser/skin/sidebars.svg"); + list-style-image: var(--uc-sidebar-icon-reverse); } #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); @@ -11674,7 +11686,7 @@ --menuitem-image: url("../icons/toolbar.svg"); } #viewSidebarMenuMenu { - --menuitem-image: url("chrome://browser/skin/sidebars.svg"); + --menuitem-image: var(--uc-sidebar-icon); } #viewFullZoomMenu { --menuitem-image: url("../icons/screenshot.svg"); diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 0c20225..6d1d8ee 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -104,7 +104,8 @@ menu.share-tab-url-item { --menuitem-image: url("../icons/toolbar.svg"); } #viewSidebarMenuMenu { - --menuitem-image: url("chrome://browser/skin/sidebars.svg"); + // --menuitem-image: url("chrome://browser/skin/sidebars.svg"); + --menuitem-image: var(--uc-sidebar-icon); } #viewFullZoomMenu { diff --git a/src/icons/_index.scss b/src/icons/_index.scss index ee4a326..f158aa0 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -4,6 +4,16 @@ } /** Panel - Icons *************************************************************/ +:root { + --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg"); + @include Has { + &:has(#sidebar-box[positionend="true"]) { + --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg"); + --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg"); + } + } +} @include Option("userChrome.icon.panel") { @import "layout/panel"; @import "panel"; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 87511f5..7c310f2 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -390,6 +390,10 @@ panelMenuBookmarkThisPage[starred] { /*= BMB_bookmarksPopup =======================================================*/ #BMB_viewBookmarksSidebar { + --menuitem-image: var(--uc-sidebar-icon); + &[data-l10n-args='{"isVisible":true}'] { + --menuitem-image: url("chrome://global/skin/icons/close.svg"); + } } #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { @@ -469,11 +473,7 @@ panelMenuBookmarkThisPage[starred] { } #sidebar-reverse-position { - list-style-image: url("chrome://browser/skin/sidebars-right.svg"); -} -#sidebar-box[positionend="true"] #sidebar-reverse-position { - /* Can't apply this. shadow dom */ - list-style-image: url("chrome://browser/skin/sidebars.svg"); + list-style-image: var(--uc-sidebar-icon-reverse); } #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { From d253553d26001737aecfa933a0b2705c3787094e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 29 Jan 2023 12:46:42 +0900 Subject: [PATCH 20/32] Fix: Icons - Bookmark menu padding #595 --- __tests__/native_menu.test.scss | 7 ++++++ css/leptonChrome.css | 30 ++++++++++++++++---------- css/leptonContent.css | 26 +++++++++++++++-------- src/compatibility/_os.scss | 7 +++--- src/icons/layout/_menu_common.scss | 34 ++++++++++++++++-------------- src/utils/_native_menu.scss | 7 ++++++ 6 files changed, 71 insertions(+), 40 deletions(-) diff --git a/__tests__/native_menu.test.scss b/__tests__/native_menu.test.scss index 7b6d005..ba7189b 100644 --- a/__tests__/native_menu.test.scss +++ b/__tests__/native_menu.test.scss @@ -9,6 +9,9 @@ @include native_menu.NativeMenu { @include example; } + @include native_menu.NativeMenuPopup { + @include example; + } @include native_menu.Win10_NativeMenu { @include example; } @@ -17,6 +20,10 @@ @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { @include example; } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup), + menupopup:not([placespopup="true"]) { + @include example; + } @media not (-moz-windows-non-native-menus) { @include example; } diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7b1c8ba..e9146b9 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -310,15 +310,15 @@ @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { @media not (-moz-windows-non-native-menus) { menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"], - menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"], menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"], + menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"], menupopup:not([placespopup="true"]) menuitem[_moz-menuactive="true"] { background-color: #91c9f7 !important; border-color: transparent !important; } menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"][disabled="true"], - menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"][disabled="true"], menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"][disabled="true"], + menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"][disabled="true"], menupopup:not([placespopup="true"]) menuitem[_moz-menuactive="true"][disabled="true"] { background-color: color-mix(in srgb, currentColor 9%, transparent) !important; border-color: transparent !important; @@ -10511,25 +10511,33 @@ } @media not (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding: 5px; + --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } - .menu-iconic > .menu-iconic-left, - .menuitem-iconic > .menu-iconic-left { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { appearance: none !important; padding-block: 0 !important; padding-inline-start: 5px !important; margin-inline-end: 8px !important; } - .menu-accel, - .menu-iconic-accel { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel { box-sizing: content-box; min-height: 16px; } - .menu-accel, - .menu-iconic-accel, - .menu-text, - .menu-iconic-text { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-text, + menupopup:not([placespopup="true"]) .menu-iconic-text { padding-block: 0 !important; } } diff --git a/css/leptonContent.css b/css/leptonContent.css index 251ec9a..5019676 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2909,25 +2909,33 @@ } @media not (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding: 5px; + --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } - .menu-iconic > .menu-iconic-left, - .menuitem-iconic > .menu-iconic-left { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { appearance: none !important; padding-block: 0 !important; padding-inline-start: 5px !important; margin-inline-end: 8px !important; } - .menu-accel, - .menu-iconic-accel { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel { box-sizing: content-box; min-height: 16px; } - .menu-accel, - .menu-iconic-accel, - .menu-text, - .menu-iconic-text { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-text, + menupopup:not([placespopup="true"]) .menu-iconic-text { padding-block: 0 !important; } } diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 64edc40..6698272 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -125,10 +125,9 @@ /*= Windows 10 - Native Menu Active Color =====================================*/ @include OS($win10) { @include Win10_NativeMenu() { - menu[_moz-menuactive="true"], - menuitem[_moz-menuactive="true"] { - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) &, - menupopup:not([placespopup="true"]) & { + @include NativeMenuPopup { + menu[_moz-menuactive="true"], + menuitem[_moz-menuactive="true"] { background-color: #91c9f7 !important; // color-mix(in srgb, -moz-menuhover 40%, transparent) border-color: transparent !important; diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 6b8b7a6..c0d5512 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -100,26 +100,28 @@ $_initialMenus: selector.append( } @include Win10_NativeMenu() { :root { - --context-menu-background-padding: 5px; + --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } - .menu-iconic, - .menuitem-iconic { - > .menu-iconic-left { - appearance: none !important; - padding-block: 0 !important; - padding-inline-start: 5px !important; - margin-inline-end: 8px !important; + @include NativeMenuPopup { + .menu-iconic, + .menuitem-iconic { + > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + } + .menu-accel, .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } + .menu-accel, .menu-iconic-accel, + .menu-text, .menu-iconic-text { + padding-block: 0 !important; } - } - .menu-accel, .menu-iconic-accel { - box-sizing: content-box; - min-height: 16px; - } - .menu-accel, .menu-iconic-accel, - .menu-text, .menu-iconic-text { - padding-block: 0 !important; } } } diff --git a/src/utils/_native_menu.scss b/src/utils/_native_menu.scss index aeb7969..66ac8ce 100644 --- a/src/utils/_native_menu.scss +++ b/src/utils/_native_menu.scss @@ -6,6 +6,13 @@ } } +@mixin NativeMenuPopup() { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup), + menupopup:not([placespopup="true"]) { + @content; + } +} + @mixin Win10_NativeMenu() { @media not (-moz-windows-non-native-menus) { @content; From 700335e262b214bac3e53bc12b0d376374c5fcd6 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 30 Jan 2023 08:04:16 +0900 Subject: [PATCH 21/32] Add: Compatibility - Win11 Mode #580 --- css/leptonChrome.css | 13 +++++++++++++ css/leptonContent.css | 13 +++++++++++++ src/icons/layout/_menu_common.scss | 6 ++++++ user.js | 1 + 4 files changed, 33 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e9146b9..7a69083 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10514,6 +10514,11 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + :root { + --context-menu-background-padding: 5px; + } + } menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, @@ -10523,6 +10528,14 @@ padding-inline-start: 5px !important; margin-inline-end: 8px !important; } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + box-sizing: content-box; + } + } menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, menupopup:not([placespopup="true"]) .menu-accel, diff --git a/css/leptonContent.css b/css/leptonContent.css index 5019676..eed74a0 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2912,6 +2912,11 @@ --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + :root { + --context-menu-background-padding: 5px; + } + } menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, @@ -2921,6 +2926,14 @@ padding-inline-start: 5px !important; margin-inline-end: 8px !important; } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + box-sizing: content-box; + } + } menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, menupopup:not([placespopup="true"]) .menu-accel, diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index c0d5512..7163c97 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -102,6 +102,9 @@ $_initialMenus: selector.append( :root { --context-menu-background-padding: 3px; --menu-background-padding-default: 0px; + @include Option("userChrome.compatibility.os.win11") { + --context-menu-background-padding: 5px; + } } @include NativeMenuPopup { @@ -112,6 +115,9 @@ $_initialMenus: selector.append( padding-block: 0 !important; padding-inline-start: 5px !important; margin-inline-end: 8px !important; + @include Option("userChrome.compatibility.os.win11") { + box-sizing: content-box; + } } } .menu-accel, .menu-iconic-accel { diff --git a/user.js b/user.js index c649538..e886d31 100644 --- a/user.js +++ b/user.js @@ -70,6 +70,7 @@ user_pref("userChrome.rounding.square_tab", false); // -- 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 8ac1fb6e47d3078e6759cbfbbad647d0801dcc4e Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 31 Jan 2023 11:22:53 +0900 Subject: [PATCH 22/32] Fix: Hidden - urlbar iconbox label margin #593 --- css/leptonChrome.css | 5 +++++ src/hidden/_index.scss | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7a69083..44a922c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9605,6 +9605,11 @@ } } @supports -moz-bool-pref("userChrome.hidden.urlbar_iconbox.label_only") { + #identity-box[pageproxystate="valid"].notSecureText, + #identity-box[pageproxystate="valid"].chromeUI, + #identity-box[pageproxystate="valid"].extensionPage { + margin-inline-end: var(--identity-box-margin-inline) !important; + } #identity-box[pageproxystate="valid"].chromeUI #identity-icon-box:not(:hover), #identity-box[pageproxystate="valid"].extensionPage #identity-icon-box:not(:hover) { background-color: transparent !important; diff --git a/src/hidden/_index.scss b/src/hidden/_index.scss index 3047a1c..6bfc65d 100644 --- a/src/hidden/_index.scss +++ b/src/hidden/_index.scss @@ -65,6 +65,12 @@ } } @include Option("userChrome.hidden.urlbar_iconbox.label_only") { + &.notSecureText, + &.chromeUI, + &.extensionPage { + margin-inline-end: var(--identity-box-margin-inline) !important; + } + &.chromeUI #identity-icon-box, &.extensionPage #identity-icon-box { &:not(:hover) { From ca1ee5222ae7e685f33d97449154576afbc0c3bd Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Thu, 2 Feb 2023 13:16:05 +0500 Subject: [PATCH 23/32] Fix: Rounding - Remove radio button --- css/leptonChrome.css | 3 +-- src/rounding/_square.scss | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 44a922c..dd741f4 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3131,8 +3131,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { - .checkbox-check, - xul|*.radio-check { + .checkbox-check { border-radius: 0 !important; } } diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index d196c16..08efc1d 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -90,8 +90,7 @@ } @include Option("userChrome.rounding.square_checklabel") { - .checkbox-check, - xul|*.radio-check { + .checkbox-check { border-radius: 0 !important; } } From 5ad1750b05b9b14f0e1ae6516d262e897e5874c5 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 1 Feb 2023 20:15:28 +0900 Subject: [PATCH 24/32] Fix: Icons - Bookmark menu padding at Win10 #595 --- css/leptonChrome.css | 12 ++++++++---- src/icons/layout/_bookmark_menu.scss | 8 +++++--- src/padding/_panel.scss | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 44a922c..acd6bac 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3761,7 +3761,6 @@ /*= Panel - Reduce padding ===================================================*/ @supports -moz-bool-pref("userChrome.padding.panel") { :root { - --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ @@ -10679,9 +10678,14 @@ menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; - padding-inline-start: calc(var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding)) !important; - background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; + --arrowpanel-bookmark-menuicon-padding: calc( + var(--arrowpanel-menuicon-padding) - var(--arrowpanel-menuitem-margin-inline) + ); + margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important; + padding-inline-start: calc( + var(--arrowpanel-bookmark-menuicon-padding) + var(--context-menu-text-padding) + ) !important; + background-position: var(--uc-menu-background-position) var(--arrowpanel-bookmark-menuicon-padding) center !important; } } /* Linux */ diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss index 7e3a8a3..78cc127 100644 --- a/src/icons/layout/_bookmark_menu.scss +++ b/src/icons/layout/_bookmark_menu.scss @@ -80,9 +80,11 @@ $_bookmarkToolbarMenus: selector.nest( @include OS($win10) { /* Bookmark Popup - None icon menu */ @include _layoutBookmarkMenu() { - margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; - padding-inline-start: calc(var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding)) !important; - background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; + --arrowpanel-bookmark-menuicon-padding: calc(var(--arrowpanel-menuicon-padding) - var(--arrowpanel-menuitem-margin-inline)); + + margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important; + padding-inline-start: calc(var(--arrowpanel-bookmark-menuicon-padding) + var(--context-menu-text-padding)) !important; + background-position: var(--uc-menu-background-position) var(--arrowpanel-bookmark-menuicon-padding) center !important; } } diff --git a/src/padding/_panel.scss b/src/padding/_panel.scss index 7ae6485..5e356c3 100644 --- a/src/padding/_panel.scss +++ b/src/padding/_panel.scss @@ -1,5 +1,5 @@ :root { - --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ + // --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ From da738749e508b0e603fe2a625c219ee294d54137 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 2 Feb 2023 17:35:54 +0900 Subject: [PATCH 25/32] Doc: Preference - Update autoconfig contents --- docs/Preference.md | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/Preference.md b/docs/Preference.md index 5c94d1e..6598494 100644 --- a/docs/Preference.md +++ b/docs/Preference.md @@ -146,16 +146,32 @@ Customizations that cannot be done with add-on and [`User Custom CSS`](./README. - [Bug 1432901 - Prototype loading ES6 Module as JSM](https://bugzilla.mozilla.org/show_bug.cgi?id=1432901) **How to** +- `/defaults/pref/autoconfig.js` ```javascript pref("general.config.filename", "config.js"); // alternative to "firefox.cfg", for using highlight pref("general.config.obscure_value", 0); +pref("general.config.sandbox_enabled", false); // Sandbox needs to be disabled in release and Beta versions +``` + +- `/config.js` +```javascript +// skip 1st line +try { + const cmanifest = Cc['@mozilla.org/file/directory_service;1'].getService(Ci.nsIProperties).get('UChrm', Ci.nsIFile); + cmanifest.append('utils'); + cmanifest.append('chrome.manifest'); + + if(cmanifest.exists()){ + Components.manager.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(cmanifest); + ChromeUtils.import('chrome://userchromejs/content/boot.jsm'); + } + +} catch(ex) {}; ``` **Example** -```javascript -pref("general.config.filename", "config.js"); // alternative to "firefox.cfg", for using highlight -pref("general.config.obscure_value", 0); -``` +- [MrOtherGuy/fx-autoconfig](https://github.com/MrOtherGuy/fx-autoconfig) +- [xiaoxiaoflood/firefox-scripts](https://github.com/xiaoxiaoflood/firefox-scripts) ## Using with User Custom CSS **Related Docs** From 2e0a257a4d8f174fcb0e5a0af86ab92b91e0e215 Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Sat, 4 Feb 2023 09:39:56 +0500 Subject: [PATCH 26/32] Fix: Rounding - Square options in dialogs --- css/leptonChrome.css | 47 ++++++++++++++++++---- css/leptonContent.css | 52 +++++++++++++++++++------ src/contents/_rounding.scss | 10 ++--- src/library/_proton.scss | 30 +++++++++++--- src/rounding/_square.scss | 3 +- src/theme/proton_chrome/_page_info.scss | 6 ++- 6 files changed, 116 insertions(+), 32 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e844014..590fc89 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2243,7 +2243,6 @@ --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important; } #viewGroup > radio { - border-radius: 8px !important; padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important; margin: 4px !important; list-style-image: none !important; @@ -2255,6 +2254,11 @@ fill: currentColor !important; color: var(--in-content-deemphasized-text) !important; /* FieldText */ } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #viewGroup > radio { + border-radius: 8px !important; + } + } #viewGroup > radio:hover { background-color: var(--in-content-button-background-hover) !important; /* #E0E8F6; */ } @@ -2439,7 +2443,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; - border-radius: 4px !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton { + border-radius: 4px !important; + } } #placesToolbar > toolbarbutton[disabled] { opacity: 0.6 !important; @@ -2463,11 +2471,15 @@ #placesMenu > menu { appearance: none !important; color: var(--organizer-color) !important; - border-radius: 4px !important; padding-block: 5px !important; padding-inline-start: 5px !important; margin-inline-end: 2px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #placesMenu > menu { + border-radius: 4px !important; + } + } #placesMenu > menu[_moz-menuactive="true"], #placesMenu > menu:hover { background-color: var(--organizer-hover-background) !important; @@ -2489,11 +2501,16 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; - border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input { + border-radius: 4px !important; + } + } #searchFilter[focused] { box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important; background-color: var(--organizer-toolbar-field-background-focused) !important; @@ -2629,12 +2646,17 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 4px !important; + } + } #editBookmarkPanelRows .expander-up:hover, #editBookmarkPanelRows .expander-down:hover { background-color: var(--organizer-hover-background) !important; @@ -2662,12 +2684,16 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #places input { + border-radius: 4px !important; + } + } #places input:focus { outline: 2px solid var(--organizer-outline-color) !important; outline-offset: -1px !important; @@ -2684,7 +2710,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; - border-radius: 4px !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 4px !important; + } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { border: 1px solid transparent !important; @@ -3100,7 +3130,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - xul|menupopup { + xul|menulist > xul|menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; } @@ -3116,6 +3146,7 @@ html|select[size][multiple], xul|listheader, xul|richlistbox, + xul|menulist, html|input { border-radius: 0 !important; } diff --git a/css/leptonContent.css b/css/leptonContent.css index eed74a0..6e72a4f 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2244,7 +2244,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; - border-radius: 4px !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton { + border-radius: 4px !important; + } } #placesToolbar > toolbarbutton[disabled] { opacity: 0.6 !important; @@ -2268,11 +2272,15 @@ #placesMenu > menu { appearance: none !important; color: var(--organizer-color) !important; - border-radius: 4px !important; padding-block: 5px !important; padding-inline-start: 5px !important; margin-inline-end: 2px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #placesMenu > menu { + border-radius: 4px !important; + } + } #placesMenu > menu[_moz-menuactive="true"], #placesMenu > menu:hover { background-color: var(--organizer-hover-background) !important; @@ -2294,11 +2302,16 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; - border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input { + border-radius: 4px !important; + } + } #searchFilter[focused] { box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important; background-color: var(--organizer-toolbar-field-background-focused) !important; @@ -2434,12 +2447,17 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_button") { + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 4px !important; + } + } #editBookmarkPanelRows .expander-up:hover, #editBookmarkPanelRows .expander-down:hover { background-color: var(--organizer-hover-background) !important; @@ -2467,12 +2485,16 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #places input { + border-radius: 4px !important; + } + } #places input:focus { outline: 2px solid var(--organizer-outline-color) !important; outline-offset: -1px !important; @@ -2489,7 +2511,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; - border-radius: 4px !important; + } + @supports not -moz-bool-pref("userChrome.rounding.square_field") { + #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 4px !important; + } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { border: 1px solid transparent !important; @@ -2726,7 +2752,8 @@ } /** Rounding ******************************************************************/ @supports -moz-bool-pref("userChrome.rounding.square_button") { - @-moz-document url-prefix("about:") { + @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs") + { button, .close-icon, .action-icon::before, @@ -2771,7 +2798,8 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { - @-moz-document url-prefix("about:") { + @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs") + { input[type="checkbox"]:not(.toggle-button), .checkbox-check { border-radius: 0 !important; @@ -2779,7 +2807,8 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_field") { - @-moz-document url-prefix("about:") { + @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs") + { input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), textarea, select, @@ -2801,8 +2830,9 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - @-moz-document url-prefix("about:preferences") { - menupopup { + @-moz-document url-prefix("about:preferences"), url-prefix("chrome://browser/content/preferences/dialogs") + { + xul|menulist > xul|menupopup { --panel-border-radius: 0 !important; } } diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index f2590ae..e00624b 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -1,5 +1,5 @@ @include Option("userChrome.rounding.square_button") { - @include moz-document(url-prefix "about:") { + @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") { button, .close-icon, .action-icon::before, @@ -49,7 +49,7 @@ } @include Option("userChrome.rounding.square_checklabel") { - @include moz-document(url-prefix "about:") { + @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") { input[type="checkbox"]:not(.toggle-button), .checkbox-check { border-radius: 0 !important; @@ -58,7 +58,7 @@ } @include Option("userChrome.rounding.square_field") { - @include moz-document(url-prefix "about:") { + @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") { input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), textarea, select, @@ -85,8 +85,8 @@ } @include Option("userChrome.rounding.square_menupopup") { - @include moz-document(url-prefix "about:preferences") { - menupopup { + @include moz-document(url-prefix "about:preferences", url-prefix "chrome://browser/content/preferences/dialogs") { + xul|menulist > xul|menupopup { --panel-border-radius: 0 !important; } } diff --git a/src/library/_proton.scss b/src/library/_proton.scss index 8a1d961..68d9cdf 100644 --- a/src/library/_proton.scss +++ b/src/library/_proton.scss @@ -80,7 +80,10 @@ > toolbarbutton { appearance: none !important; padding: 5px !important; - border-radius: 4px !important; + + @include NotOption("userChrome.rounding.square_button") { + border-radius: 4px !important; + } &[disabled] { opacity: 0.6 !important; @@ -108,11 +111,14 @@ > menu { appearance: none !important; color: var(--organizer-color) !important; - border-radius: 4px !important; padding-block: 5px !important; padding-inline-start: 5px !important; margin-inline-end: 2px !important; + @include NotOption("userChrome.rounding.square_button") { + border-radius: 4px !important; + } + &[_moz-menuactive="true"], &:hover { background-color: var(--organizer-hover-background) !important; @@ -137,10 +143,13 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; - border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; + + @include NotOption("userChrome.rounding.square_field") { + border-radius: 4px !important; + } } #searchFilter[focused] { @@ -298,12 +307,15 @@ treechildren { margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; + @include NotOption("userChrome.rounding.square_button") { + border-radius: 4px !important; + } + &:hover { background-color: var(--organizer-hover-background) !important; color: var(--organizer-hover-color) !important; @@ -334,12 +346,15 @@ treechildren { #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; - border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; + @include NotOption("userChrome.rounding.square_field") { + border-radius: 4px !important; + } + &:focus { outline: 2px solid var(--organizer-outline-color) !important; outline-offset: -1px !important; @@ -359,7 +374,10 @@ treechildren { color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; - border-radius: 4px !important; + + @include NotOption("userChrome.rounding.square_field") { + border-radius: 4px !important; + } > richlistitem { border: 1px solid transparent !important; diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 08efc1d..a1567fa 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -55,7 +55,7 @@ } @include Option("userChrome.rounding.square_menupopup") { - xul|menupopup { + xul|menulist > xul|menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; } @@ -72,6 +72,7 @@ html|select[size][multiple], xul|listheader, xul|richlistbox, + xul|menulist, html|input { border-radius: 0 !important; } diff --git a/src/theme/proton_chrome/_page_info.scss b/src/theme/proton_chrome/_page_info.scss index 26b5bc6..7e7624d 100644 --- a/src/theme/proton_chrome/_page_info.scss +++ b/src/theme/proton_chrome/_page_info.scss @@ -5,7 +5,6 @@ } #viewGroup > radio { - border-radius: 8px !important; padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important; margin: 4px !important; @@ -18,6 +17,11 @@ -moz-context-properties: fill !important; fill: currentColor !important; color: var(--in-content-deemphasized-text) !important; /* FieldText */ + + @include NotOption("userChrome.rounding.square_button") { + border-radius: 8px !important; + } + &:hover { background-color: var(--in-content-button-background-hover) !important; /* #E0E8F6; */ } From 482b52254060acbf27b857f602d13fb192c99d18 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 4 Feb 2023 19:40:49 +0900 Subject: [PATCH 27/32] Doc: @2641a40fd44383320adde4b027a1d0b03bd550 to major contributor #604 --- CREDITS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CREDITS b/CREDITS index 8bb4ea1..9b18c90 100644 --- a/CREDITS +++ b/CREDITS @@ -7,6 +7,9 @@ ---------- Major Contributors +N: 2641a40fd44383320adde4b027a1d0b03bd550 +W: https://github.com/2641a40fd44383320adde4b027a1d0b03bd550 + N: AveYo E: aveyo@yahoo.com W: https://github.com/AveYo @@ -43,9 +46,6 @@ W: https://www.oss.kr/ ---------- Contributors -N: 2641a40fd44383320adde4b027a1d0b03bd550 -W: https://github.com/2641a40fd44383320adde4b027a1d0b03bd550 - N: 7k5x E: 7k5xlp0onfire@gmail.com W: https://github.com/7k5x From 24948d440769d5a34560230b1547dcdaacc7908f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 6 Feb 2023 03:17:26 +0900 Subject: [PATCH 28/32] Fix: Padding - Panel margin compatibility FF v102(ESR) #595 --- css/leptonChrome.css | 4 ++++ src/padding/_panel.scss | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 590fc89..8259817 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3791,12 +3791,16 @@ /*= Panel - Reduce padding ===================================================*/ @supports -moz-bool-pref("userChrome.padding.panel") { :root { + --arrowpanel-menuitem-margin-block: 0; /* FF 102 compatibility */ + --arrowpanel-menuitem-margin-inline: 8px; + --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ --arrowpanel-padding: 0.8em !important; /* Original: 16px or .cui-widget-panel, .cui-widget-panel::part(arrowcontent) => 4px 0 */ } :root[uidensity="compact"] { + --arrowpanel-menuitem-margin-inline: 4px; /* FF 102 compatibility */ --arrowpanel-menuitem-padding-block: 3px !important; --arrowpanel-menuitem-padding-inline: 3px !important; } diff --git a/src/padding/_panel.scss b/src/padding/_panel.scss index 5e356c3..e1d414a 100644 --- a/src/padding/_panel.scss +++ b/src/padding/_panel.scss @@ -1,5 +1,7 @@ :root { - // --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ + --arrowpanel-menuitem-margin-block: 0; /* FF 102 compatibility */ + --arrowpanel-menuitem-margin-inline: 8px; + --arrowpanel-menuitem-margin: var(--arrowpanel-menuitem-margin-block) var(--arrowpanel-menuitem-margin-inline) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ @@ -7,6 +9,7 @@ } :root[uidensity="compact"] { + --arrowpanel-menuitem-margin-inline: 4px; /* FF 102 compatibility */ --arrowpanel-menuitem-padding-block: 3px !important; --arrowpanel-menuitem-padding-inline: 3px !important; } From 8ce8304d771b84a93030eac139c40408bb1109cf Mon Sep 17 00:00:00 2001 From: 2641a40fd44383320adde4b027a1d0b03bd550 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:39:52 +0500 Subject: [PATCH 29/32] Fix: Rounding - Context menu and library on Windows 10 --- css/leptonChrome.css | 48 ++++++++++++++++++++++++--------- css/leptonContent.css | 53 +++++++++++++++++++++++++++---------- src/contents/_rounding.scss | 4 +-- src/leptonContent.scss | 5 ++++ src/library/_proton.scss | 30 ++++++++++++--------- src/rounding/_index.scss | 1 + src/rounding/_library.scss | 17 ++++++++++++ src/rounding/_square.scss | 2 +- 8 files changed, 118 insertions(+), 42 deletions(-) create mode 100644 src/rounding/_library.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8259817..37371c5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2443,10 +2443,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesToolbar > toolbarbutton { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesToolbar > toolbarbutton[disabled] { @@ -2473,11 +2474,12 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesMenu > menu { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesMenu > menu[_moz-menuactive="true"], @@ -2501,14 +2503,15 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #searchFilter, #detailsPane html|input { - border-radius: 4px !important; + border-radius: 0 !important; } } #searchFilter[focused] { @@ -2646,15 +2649,16 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBookmarkPanelRows .expander-up:hover, @@ -2684,14 +2688,15 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #places input { - border-radius: 4px !important; + border-radius: 0 !important; } } #places input:focus { @@ -2710,10 +2715,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #editBMPanel_tagsSelectorRow > richlistbox { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { @@ -3130,7 +3136,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; } @@ -3166,6 +3172,22 @@ border-radius: 0 !important; } } +/*= Library ==============================================================*/ +@supports -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } +} +@supports -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } +} /* --toolbarbutton-border-radius: 4px; */ diff --git a/css/leptonContent.css b/css/leptonContent.css index 6e72a4f..7b71dc6 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2244,10 +2244,11 @@ #placesToolbar > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesToolbar > toolbarbutton { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesToolbar > toolbarbutton[disabled] { @@ -2274,11 +2275,12 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #placesMenu > menu { - border-radius: 4px !important; + border-radius: 0 !important; } } #placesMenu > menu[_moz-menuactive="true"], @@ -2302,14 +2304,15 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #searchFilter, #detailsPane html|input { - border-radius: 4px !important; + border-radius: 0 !important; } } #searchFilter[focused] { @@ -2447,15 +2450,16 @@ margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_button") { + @supports -moz-bool-pref("userChrome.rounding.square_button") { #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBookmarkPanelRows .expander-up:hover, @@ -2485,14 +2489,15 @@ } #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #places input { - border-radius: 4px !important; + border-radius: 0 !important; } } #places input:focus { @@ -2511,10 +2516,11 @@ color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; } - @supports not -moz-bool-pref("userChrome.rounding.square_field") { + @supports -moz-bool-pref("userChrome.rounding.square_field") { #editBMPanel_tagsSelectorRow > richlistbox { - border-radius: 4px !important; + border-radius: 0 !important; } } #editBMPanel_tagsSelectorRow > richlistbox > richlistitem { @@ -2830,9 +2836,9 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { - @-moz-document url-prefix("about:preferences"), url-prefix("chrome://browser/content/preferences/dialogs") + @-moz-document url-prefix("about:"), url-prefix("chrome://") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0 !important; } } @@ -2842,6 +2848,25 @@ } } } +@-moz-document url("chrome://browser/content/places/places.xhtml") +{ + /*= Library ==============================================================*/ + @supports -moz-bool-pref("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } + } + @supports -moz-bool-pref("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } + } +} /** Monospace *****************************************************************/ @supports -moz-bool-pref("userContent.page.monospace") { @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss index e00624b..e7bdde3 100644 --- a/src/contents/_rounding.scss +++ b/src/contents/_rounding.scss @@ -85,8 +85,8 @@ } @include Option("userChrome.rounding.square_menupopup") { - @include moz-document(url-prefix "about:preferences", url-prefix "chrome://browser/content/preferences/dialogs") { - xul|menulist > xul|menupopup { + @include moz-document(url-prefix "about:", url-prefix "chrome://") { + menupopup { --panel-border-radius: 0 !important; } } diff --git a/src/leptonContent.scss b/src/leptonContent.scss index 70259b8..abe1704 100644 --- a/src/leptonContent.scss +++ b/src/leptonContent.scss @@ -38,6 +38,11 @@ /** Rounding ******************************************************************/ @import "contents/rounding"; +// Put here to include library as a tab +@include moz-document(url "chrome://browser/content/places/places.xhtml") { + @import "rounding/library"; +} + /** Monospace *****************************************************************/ @include Option("userContent.page.monospace") { @import "contents/monospace"; diff --git a/src/library/_proton.scss b/src/library/_proton.scss index 68d9cdf..f48a152 100644 --- a/src/library/_proton.scss +++ b/src/library/_proton.scss @@ -80,9 +80,10 @@ > toolbarbutton { appearance: none !important; padding: 5px !important; + border-radius: 4px !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &[disabled] { @@ -113,10 +114,11 @@ color: var(--organizer-color) !important; padding-block: 5px !important; padding-inline-start: 5px !important; + border-radius: 4px !important; margin-inline-end: 2px !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &[_moz-menuactive="true"], @@ -143,12 +145,13 @@ background-color: var(--organizer-toolbar-field-background) !important; color: var(--organizer-color) !important; border: 1px solid var(--organizer-toolbar-field-border-color) !important; + border-radius: 4px !important; margin: 0 !important; padding-block: 2px !important; min-height: 24px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } } @@ -307,13 +310,14 @@ treechildren { margin: 0 !important; margin-inline-end: 4px !important; border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; -moz-context-properties: fill !important; fill: currentColor !important; - @include NotOption("userChrome.rounding.square_button") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_button") { + border-radius: 0 !important; } &:hover { @@ -346,13 +350,14 @@ treechildren { #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; + border-radius: 4px !important; background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; min-height: 20px !important; padding-inline: 4px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } &:focus { @@ -374,9 +379,10 @@ treechildren { color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; border: 1px solid var(--organizer-border-color) !important; + border-radius: 4px !important; - @include NotOption("userChrome.rounding.square_field") { - border-radius: 4px !important; + @include Option("userChrome.rounding.square_field") { + border-radius: 0 !important; } > richlistitem { diff --git a/src/rounding/_index.scss b/src/rounding/_index.scss index a46fa88..577efc6 100644 --- a/src/rounding/_index.scss +++ b/src/rounding/_index.scss @@ -1,5 +1,6 @@ /** Rounding ******************************************************************/ @import "square"; +@import "library"; /* --toolbarbutton-border-radius: 4px; diff --git a/src/rounding/_library.scss b/src/rounding/_library.scss new file mode 100644 index 0000000..a31bc2e --- /dev/null +++ b/src/rounding/_library.scss @@ -0,0 +1,17 @@ +/*= Library ==============================================================*/ +@include Option("userChrome.rounding.square_button") { + #placesToolbar > toolbarbutton, + #placesMenu > menu, + #editBookmarkPanelRows .expander-up, + #editBookmarkPanelRows .expander-down { + border-radius: 0 !important; + } +} +@include Option("userChrome.rounding.square_field") { + #searchFilter, + #detailsPane html|input, + #places input + #editBMPanel_tagsSelectorRow > richlistbox { + border-radius: 0 !important; + } +} diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index a1567fa..d2dd19e 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -55,7 +55,7 @@ } @include Option("userChrome.rounding.square_menupopup") { - xul|menulist > xul|menupopup { + menupopup { --panel-border-radius: 0px !important; border-radius: 0 !important; } From d8d19cd52a0d1bb956b4549e6bf2663ac810d1b4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 7 Feb 2023 11:29:53 +0900 Subject: [PATCH 30/32] Fix: Padding - Unified extension menu button #603 --- css/leptonChrome.css | 12 +++++------- src/decoration/_cursor.scss | 14 +++++++------- src/padding/_panel.scss | 9 +++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8259817..7605a1b 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2764,15 +2764,10 @@ #identity-popup-clear-sitedata-button, #identity-popup-more-info, #unified-extensions-manage-extensions, - .unified-extensions-item-open-menu { + .unified-extensions-item-open-menu, + .unified-extensions-item-menu-button.subviewbutton { cursor: pointer !important; } - /* TODO: For now, fxa-menu doesn't show any status. - (JS required, observe .syncNowBtn status) - #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] { - cursor: progress !important; - } - */ } /*= Panel UI Button Separator ================================================*/ @supports -moz-bool-pref("userChrome.decoration.panel_button_separator") { @@ -3818,6 +3813,9 @@ } } } + .unified-extensions-item-menu-button.subviewbutton { + padding: 8px !important; /* Original: var(--arrowpanel-menuitem-padding-inline) */ + } } @supports -moz-bool-pref("userChrome.padding.panel_header") { .panel-header { diff --git a/src/decoration/_cursor.scss b/src/decoration/_cursor.scss index 74aec7c..acc4b34 100644 --- a/src/decoration/_cursor.scss +++ b/src/decoration/_cursor.scss @@ -23,13 +23,13 @@ menuitem.openintabs-menuitem, #identity-popup-clear-sitedata-button, #identity-popup-more-info, #unified-extensions-manage-extensions, -.unified-extensions-item-open-menu { +.unified-extensions-item-open-menu, +.unified-extensions-item-menu-button.subviewbutton { cursor: pointer !important; } -/* TODO: For now, fxa-menu doesn't show any status. - (JS required, observe .syncNowBtn status) - #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] { - cursor: progress !important; - } - */ +// TODO: For now, fxa-menu doesn't show any status. +// (JS required, observe .syncNowBtn status) +// #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] { +// cursor: progress !important; +// } diff --git a/src/padding/_panel.scss b/src/padding/_panel.scss index e1d414a..716d2c4 100644 --- a/src/padding/_panel.scss +++ b/src/padding/_panel.scss @@ -29,3 +29,12 @@ } } } + +// #603 +.unified-extensions-item-menu-button.subviewbutton { + padding: 8px !important; /* Original: var(--arrowpanel-menuitem-padding-inline) */ +} +// Or +// toolbaritem.unified-extensions-item[unified-extensions="true"] .unified-extensions-item-menu-button.subviewbutton { +// padding: var(--arrowpanel-menuitem-padding-inline) !important; +// } From 56176130891565878bc6a6e4bf6b403e9c16719a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 8 Feb 2023 04:50:04 +0900 Subject: [PATCH 31/32] Fix: Compatibility - Windows7 Classic Theme's menu #592 --- css/leptonChrome.css | 45 +++++++++++++++++------------- css/leptonContent.css | 5 ++++ src/compatibility/_os.scss | 22 ++++++++------- src/icons/layout/_menu_common.scss | 3 ++ 4 files changed, 46 insertions(+), 29 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7605a1b..1162de4 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -273,25 +273,27 @@ } } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { - menu[_moz-menuactive="true"], - menuitem[_moz-menuactive="true"] { - background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important; - border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important; - } - menu[_moz-menuactive="true"][disabled="true"], - menuitem[_moz-menuactive="true"][disabled="true"] { - background-color: color-mix(in srgb, currentColor 5%, transparent) !important; - border-color: color-mix(in srgb, currentColor 60%, transparent) !important; - } - /* Remove text shadow */ - :root:-moz-lwtheme #toolbar-menubar { - text-shadow: unset !important; - /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ - } - /* Remove Color */ - :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { - background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ - color: unset !important; /* Original: black */ + @media (-moz-windows-classic: 0) { + menu[_moz-menuactive="true"], + menuitem[_moz-menuactive="true"] { + background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important; + border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important; + } + menu[_moz-menuactive="true"][disabled="true"], + menuitem[_moz-menuactive="true"][disabled="true"] { + background-color: color-mix(in srgb, currentColor 5%, transparent) !important; + border-color: color-mix(in srgb, currentColor 60%, transparent) !important; + } + /* Remove text shadow */ + :root:-moz-lwtheme #toolbar-menubar { + text-shadow: unset !important; + /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ + } + /* Remove Color */ + :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { + background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ + color: unset !important; /* Original: black */ + } } } @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { @@ -10504,6 +10506,11 @@ :root { --context-menu-background-padding-default: 2px; } + @media (-moz-windows-classic) { + :root { + --context-menu-background-padding-default: -0.5px; + } + } } @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { :root { diff --git a/css/leptonContent.css b/css/leptonContent.css index 6e72a4f..193dd43 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2908,6 +2908,11 @@ :root { --context-menu-background-padding-default: 2px; } + @media (-moz-windows-classic) { + :root { + --context-menu-background-padding-default: -0.5px; + } + } } @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { :root { diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 6698272..d5fa112 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -104,18 +104,20 @@ //------------------------------------------------------------------------------ @include OS($win7) { - @include _os_menuEmulate(5%, 60%); + @media (-moz-windows-classic: 0) { + @include _os_menuEmulate(5%, 60%); - /* Remove text shadow */ - :root:-moz-lwtheme #toolbar-menubar { - text-shadow: unset !important; - /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ - } + /* Remove text shadow */ + :root:-moz-lwtheme #toolbar-menubar { + text-shadow: unset !important; + /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ + } - /* Remove Color */ - :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { - background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ - color: unset !important; /* Original: black */ + /* Remove Color */ + :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { + background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ + color: unset !important; /* Original: black */ + } } } @include OS($win8) { diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index 7163c97..eb3af6c 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -79,6 +79,9 @@ $_initialMenus: selector.append( @include OS($win7) { :root { --context-menu-background-padding-default: 2px; + @media (-moz-windows-classic) { + --context-menu-background-padding-default: -0.5px; + } } } @include OS($win8) { From 7cd18016df0c282cd6a605a5c084d2cb40e64ec8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 9 Feb 2023 20:56:54 +0900 Subject: [PATCH 32/32] Fix: Compatibility - Menu button, right arrow padding #597 --- css/leptonChrome.css | 6 ++++++ src/compatibility/_theme.scss | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 1162de4..85ba832 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -49,6 +49,12 @@ #widget-overflow-mainView #zoom-in-button > .toolbarbutton-icon { padding-inline-start: 0px !important; } + /*= Subview button, Menu's right padding #597 ================================*/ + .subviewbutton.toolbaritem-combined-buttons:not([shortcut]), + .subviewbutton.subviewbutton-nav:not([shortcut]), + menu.subviewbutton { + padding-inline-end: 0 !important; + } /*= Icon Fill Color ==========================================================*/ :root:-moz-lwtheme { /* Auto create --lwt-toolbarbutton-icon-fill-attention, fix for nightly default theme diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index d46bf5c..331a8a2 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -24,6 +24,13 @@ } } +/*= Subview button, Menu's right padding #597 ================================*/ +.subviewbutton.toolbaritem-combined-buttons:not([shortcut]), +.subviewbutton.subviewbutton-nav:not([shortcut]), +menu.subviewbutton { + padding-inline-end: 0 !important; +} + /*= Icon Fill Color ==========================================================*/ :root:-moz-lwtheme { /* Auto create --lwt-toolbarbutton-icon-fill-attention, fix for nightly default theme