From 316dd8e1b9b7b1b460cd6adbacb79b62c604c5a3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 19 Sep 2022 09:18:34 +0900 Subject: [PATCH 01/15] Add: Autohide - Sidebar speed option #462 --- css/leptonChrome.css | 14 ++++++++++---- src/autohide/sidebar/_overlap.scss | 4 ++-- src/autohide/sidebar/_static.scss | 4 ++-- src/sidebar/_overlap.scss | 3 +++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 10ede0d..5b8476e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7378,6 +7378,8 @@ --uc-sidebar-activate-width-reverse: calc(-1 * var(--uc-sidebar-activate-width)); --uc-sidebar-fullscreen-width: 4px; --uc-sidebar-shadow-color: #28282f; + --uc-autohide-sidebar-speed: 750ms; + --uc-autohide-fullscreen-sidebar-speed: 1s; --uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */ z-index: 1 !important; @@ -8141,7 +8143,8 @@ @media (prefers-reduced-motion: no-preference) { #sidebar { - transition: min-width 750ms var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) + var(--uc-autohide-sidebar-delay) !important; } #sidebar-box:is(:hover, :focus-within) > #sidebar { @@ -8149,7 +8152,8 @@ } :root[inFullscreen="true"] #sidebar-box { - transition: padding-inline-start 1s var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: padding-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) + var(--uc-autohide-sidebar-delay) !important; } :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) { transition-delay: 0ms !important; @@ -8186,14 +8190,16 @@ @media (prefers-reduced-motion: no-preference) { #sidebar-box { - transition: min-width 750ms var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) + var(--uc-autohide-sidebar-delay) !important; } #sidebar-box:is(:hover, :focus-within) { transition-delay: 0ms !important; } :root[inFullscreen="true"] #sidebar-box { - transition: margin-inline-start 1s var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: margin-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) + var(--uc-autohide-sidebar-delay) !important; } :root[inFullscreen="true"] #sidebar-box[positionend="true"] { transition-property: margin-inline-end !important; diff --git a/src/autohide/sidebar/_overlap.scss b/src/autohide/sidebar/_overlap.scss index c282701..40b720b 100644 --- a/src/autohide/sidebar/_overlap.scss +++ b/src/autohide/sidebar/_overlap.scss @@ -30,7 +30,7 @@ @include Animate { #sidebar { - transition: min-width 750ms var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; } #sidebar-box:is(:hover, :focus-within) > #sidebar { @@ -38,7 +38,7 @@ } :root[inFullscreen="true"] #sidebar-box { - transition: padding-inline-start 1s var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: padding-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; &:is(:hover, :focus-within) { transition-delay: 0ms !important; diff --git a/src/autohide/sidebar/_static.scss b/src/autohide/sidebar/_static.scss index c1756c2..41ff435 100644 --- a/src/autohide/sidebar/_static.scss +++ b/src/autohide/sidebar/_static.scss @@ -32,7 +32,7 @@ @include Animate { #sidebar-box { - transition: min-width 750ms var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; &:is(:hover, :focus-within) { transition-delay: 0ms !important; @@ -40,7 +40,7 @@ } :root[inFullscreen="true"] #sidebar-box { - transition: margin-inline-start 1s var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; + transition: margin-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; &[positionend="true"] { transition-property: margin-inline-end !important; diff --git a/src/sidebar/_overlap.scss b/src/sidebar/_overlap.scss index 8c9f29f..75a4465 100644 --- a/src/sidebar/_overlap.scss +++ b/src/sidebar/_overlap.scss @@ -11,6 +11,9 @@ --uc-sidebar-activate-width-reverse: calc(-1 * var(--uc-sidebar-activate-width)); --uc-sidebar-fullscreen-width: 4px; --uc-sidebar-shadow-color: #28282F; + + --uc-autohide-sidebar-speed: 750ms; + --uc-autohide-fullscreen-sidebar-speed: 1s; --uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */ z-index: 1 !important; From fc204137f720b159e2102a7ace79bc9c3fba56af Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 19 Sep 2022 14:18:32 +0900 Subject: [PATCH 02/15] Fix: One Liner - Prevent truncate url view #471 --- css/leptonChrome.css | 2 ++ src/tabbar/_one_liner.scss | 1 + 2 files changed, 3 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5b8476e..46e5d27 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -4292,6 +4292,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } @@ -4406,6 +4407,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss index 4742d4f..6326d1c 100644 --- a/src/tabbar/_one_liner.scss +++ b/src/tabbar/_one_liner.scss @@ -27,6 +27,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } From 6cf02b25636cf0b21f1b6215858dfb3c6c5090b0 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 20 Sep 2022 09:11:20 +0900 Subject: [PATCH 03/15] Fix: Proton - Color for `-moz-tree-drop-feedback` #473 --- css/leptonChrome.css | 4 ++++ css/leptonContent.css | 4 ++++ src/library/_proton.scss | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 46e5d27..e88d5ba 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2720,6 +2720,10 @@ treechildren::-moz-tree-separator(selected) { border-color: var(--organizer-selected-color) !important; } + treechildren::-moz-tree-cell-text(primary, dropOn), + treechildren::-moz-tree-drop-feedback { + background-color: var(--organizer-outline-color) !important; + } /*- Info Box -------------------------------------------------------------*/ #detailsPane { diff --git a/css/leptonContent.css b/css/leptonContent.css index 30e337e..0e0d42c 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -2676,6 +2676,10 @@ treechildren::-moz-tree-separator(selected) { border-color: var(--organizer-selected-color) !important; } + treechildren::-moz-tree-cell-text(primary, dropOn), + treechildren::-moz-tree-drop-feedback { + background-color: var(--organizer-outline-color) !important; + } /*- Info Box -------------------------------------------------------------*/ #detailsPane { diff --git a/src/library/_proton.scss b/src/library/_proton.scss index 86ba436..8a1d961 100644 --- a/src/library/_proton.scss +++ b/src/library/_proton.scss @@ -275,6 +275,11 @@ treechildren { &::-moz-tree-separator(selected) { border-color: var(--organizer-selected-color) !important; } + + &::-moz-tree-cell-text(primary, dropOn), + &::-moz-tree-drop-feedback { + background-color: var(--organizer-outline-color) !important; + } } /*- Info Box -------------------------------------------------------------*/ From 88a4bab7f8785a177ab6fb641d28a3ac3bfffe80 Mon Sep 17 00:00:00 2001 From: akay <5215129+akay@users.noreply.github.com> Date: Tue, 20 Sep 2022 21:52:18 +0300 Subject: [PATCH 04/15] Fix: Compatibility - typo compatiblity -> compatibility Co-authored-by: alstjr7375 --- css/leptonChrome.css | 2 +- src/compatibility/_os.scss | 2 +- user.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e88d5ba..590182a 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -289,7 +289,7 @@ } /*= Linux - Titlebar button at lwtheme =====================================*/ - @supports not -moz-bool-pref("userChrome.compatiblity.os.linux_non_native_titlebar_button") { + @supports not -moz-bool-pref("userChrome.compatibility.os.linux_non_native_titlebar_button") { .titlebar-button:-moz-lwtheme { appearance: auto !important; } diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 905289e..59dde54 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -131,7 +131,7 @@ } /*= Linux - Titlebar button at lwtheme =====================================*/ - @include NotOption("userChrome.compatiblity.os.linux_non_native_titlebar_button") { + @include NotOption("userChrome.compatibility.os.linux_non_native_titlebar_button") { .titlebar-button:-moz-lwtheme { appearance: auto !important; } diff --git a/user.js b/user.js index 10fc2ec..6ff1b2d 100644 --- a/user.js +++ b/user.js @@ -66,7 +66,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.compatibility.navbar_top_border", true); // user_pref("userChrome.compatibility.dynamic_separator", true); // Need dynamic_seperator -// user_pref("userChrome.compatiblity.os.linux_non_native_titlebar_button", true); +// user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true); // user_pref("userChrome.compatibility.os.windows_maximized", true); // == Theme Custom Settings ==================================================== From 803a4c15ac8fb0e54368b90b3bbcf24c0375644d Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 21 Sep 2022 15:50:03 +0900 Subject: [PATCH 05/15] Fix: CI - PR's checkout #474 --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 260829a..4fb1d66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,9 +48,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - with: - # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.head_ref }} - name: Prettify code uses: creyD/prettier_action@v4.1.1 From 5d5ae9e7a9e73ec90a2013c7fe13121958b46d92 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 22 Sep 2022 10:29:32 +0900 Subject: [PATCH 06/15] Fix: Compatibility - Drag & Drop Indicator color #473 It's not works on #sidebar. Because the style is completely separated and cannot be used `var(--button-primary-bgcolor)`. --- css/leptonChrome.css | 12 ++++++++++++ src/compatibility/_theme.scss | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index e88d5ba..523d68c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -145,6 +145,18 @@ border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ } + + /*= Drop Indicator Color #473 ================================================*/ + treechildren::-moz-tree-cell-text(primary, dropOn), + treechildren::-moz-tree-drop-feedback, + vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { + background-color: var(--button-primary-bgcolor, var(--focus-outline-color)) !important; + /* Original: SelectedItem or AccentColor*/ + } + + #bookmarksPanel[lwt-sidebar="true"] { + --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 0d43087..3991c0d 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -123,3 +123,14 @@ menu { html|input.findbar-textbox { border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ } + +/*= Drop Indicator Color #473 ================================================*/ +treechildren::-moz-tree-cell-text(primary, dropOn), +treechildren::-moz-tree-drop-feedback, +vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { + background-color: var(--button-primary-bgcolor, var(--focus-outline-color)) !important; /* Original: SelectedItem or AccentColor*/ +} + +#bookmarksPanel[lwt-sidebar="true"] { + --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important; +} From 5102e2f505311d479c50fd60e0da5455767ad599 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 22 Sep 2022 14:20:01 +0900 Subject: [PATCH 07/15] Fix: One Liner - Urlbar size custom #472 --- css/leptonChrome.css | 8 ++++++-- src/tabbar/_one_liner.scss | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 523d68c..96a5756 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -4352,7 +4352,9 @@ } } #urlbar-container { - min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important; + min-width: calc( + var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding) + ) !important; } #PersonalToolbar { @@ -4467,7 +4469,9 @@ } } #urlbar-container { - min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important; + min-width: calc( + var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding) + ) !important; } #PersonalToolbar { diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss index 6326d1c..540d2ad 100644 --- a/src/tabbar/_one_liner.scss +++ b/src/tabbar/_one_liner.scss @@ -72,7 +72,7 @@ } #urlbar-container { - min-width: calc(24px + 2 * var(--toolbarbutton-inner-padding)) !important; // Original: calc(350px + 24px + 2 * var(--toolbarbutton-inner-padding)) + min-width: calc(var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding)) !important; // Original: calc(350px + 24px + 2 * var(--toolbarbutton-inner-padding)) } #PersonalToolbar { From 960912f535a3aad8f9c94c7e2bb8f9cabeb74e8b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 23 Sep 2022 11:07:58 +0900 Subject: [PATCH 08/15] Add: Padding - `userChrome.padding.first_tab.always` #475 --- css/leptonChrome.css | 36 ++++++++++++++++++++++-------------- src/padding/_drag_space.scss | 12 ++++++------ src/padding/_first_tab.scss | 17 +++++++++++++---- user.js | 1 + 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 96a5756..8e2146a 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3230,13 +3230,21 @@ @supports -moz-bool-pref("userChrome.padding.first_tab") { /* for First Tab Space */ :root { - --space-left-tabbar: 8px; + --uc-space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } - :root:not([tabsintitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]), - :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) { - padding-inline-start: var(--space-left-tabbar) !important; + @supports not -moz-bool-pref("userChrome.padding.first_tab.always") { + :root:not([tabsintitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]), + :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) { + padding-inline-start: var(--uc-space-left-tabbar) !important; + } + } + @supports -moz-bool-pref("userChrome.padding.first_tab.always") { + :root:not([tabsintitlebar]) #tabbrowser-tabs, + :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs { + padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width, 0px) + var(--uc-space-left-tabbar)) !important; + } } } @supports -moz-bool-pref("userChrome.padding.tabbar_width") { @@ -3401,18 +3409,18 @@ @supports -moz-bool-pref("userChrome.padding.drag_space") { /* for Extra Drag Space */ :root { - --space-above-tabbar: 8px; + --uc-space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] { - height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tabs-navbar-shadow-size)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size)); } @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"] { - height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tabs-navbar-shadow-size)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size)); } } } @@ -3422,18 +3430,18 @@ (-moz-platform: windows-win8), (-moz-gtk-csd-available) { :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] { - height: calc(var(--tab-min-height) + var(--space-above-tabbar)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)); } @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"] { - height: calc(var(--tab-min-height) + var(--space-above-tabbar)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)); } } } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #TabsToolbar > .toolbar-items { - padding-top: var(--space-above-tabbar) !important; + padding-top: var(--uc-space-above-tabbar) !important; } } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { @@ -3441,13 +3449,13 @@ /* Add extra space to titlebar for dragging */ :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { - padding-top: calc(var(--space-above-tabbar) + 4px) !important; + padding-top: calc(var(--uc-space-above-tabbar) + 4px) !important; } @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { - padding-top: calc(var(--space-above-tabbar) + 4px) !important; + padding-top: calc(var(--uc-space-above-tabbar) + 4px) !important; } } } @@ -3459,13 +3467,13 @@ /* Add extra space to titlebar for dragging */ :root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { - padding-top: var(--space-above-tabbar) !important; + padding-top: var(--uc-space-above-tabbar) !important; } @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { - padding-top: var(--space-above-tabbar) !important; + padding-top: var(--uc-space-above-tabbar) !important; } } } diff --git a/src/padding/_drag_space.scss b/src/padding/_drag_space.scss index 2cfa38e..07e0f75 100644 --- a/src/padding/_drag_space.scss +++ b/src/padding/_drag_space.scss @@ -1,7 +1,7 @@ /* for Extra Drag Space */ // https://searchfox.org/mozilla-esr78/search?q=--space-above-tabbar&path=&case=false®exp=false :root { - --space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ + --uc-space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } //-- Mixin --------------------------------------------------------------------- @@ -33,28 +33,28 @@ @include OS($win10) { @include _dragSpaceHeight { - height: calc(var(--tab-min-height) + var(--space-above-tabbar) - var(--tabs-navbar-shadow-size)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size)); } } @include OS($win7, $win8, $linux) { @include _dragSpaceHeight { - height: calc(var(--tab-min-height) + var(--space-above-tabbar)); + height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)); } } @include OS($mac) { #TabsToolbar > .toolbar-items { - padding-top: var(--space-above-tabbar) !important; + padding-top: var(--uc-space-above-tabbar) !important; } } @include OS($win7) { /* Add 4px extra margin on top of the tabs toolbar on Windows 7. */ @include _dragSpacePadding { - padding-top: calc(var(--space-above-tabbar) + 4px) !important; + padding-top: calc(var(--uc-space-above-tabbar) + 4px) !important; } } @include OS($win8, $win10, $linux) { @include _dragSpacePadding { - padding-top: var(--space-above-tabbar) !important; + padding-top: var(--uc-space-above-tabbar) !important; } } diff --git a/src/padding/_first_tab.scss b/src/padding/_first_tab.scss index 64c3033..508a964 100644 --- a/src/padding/_first_tab.scss +++ b/src/padding/_first_tab.scss @@ -1,9 +1,18 @@ /* for First Tab Space */ :root { - --space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ + --uc-space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } -:root:not([tabsintitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]), -:root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) { - padding-inline-start: var(--space-left-tabbar) !important; +@include NotOption("userChrome.padding.first_tab.always") { + :root:not([tabsintitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]), + :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) { + padding-inline-start: var(--uc-space-left-tabbar) !important; + } +} + +@include Option("userChrome.padding.first_tab.always") { + :root:not([tabsintitlebar]) #tabbrowser-tabs, + :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs { + padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width, 0px) + var(--uc-space-left-tabbar)) !important; + } } diff --git a/user.js b/user.js index 10fc2ec..ca5381c 100644 --- a/user.js +++ b/user.js @@ -116,6 +116,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.rounding.square_checklabel", true); // user_pref("userChrome.padding.first_tab", true); +// user_pref("userChrome.padding.first_tab.always", true); // user_pref("userChrome.padding.drag_space", true); // user_pref("userChrome.padding.drag_space.maximized", true); From 653a2c7f85c660b69e88d1751fbc5b2b83589e14 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 25 Sep 2022 07:26:28 +0900 Subject: [PATCH 09/15] Fix: Compatibility - Menu color at v105 #477 --- css/leptonChrome.css | 50 ++++++++++++++++++++++++++++++----- src/compatibility/_theme.scss | 36 +++++++++++++++++++++++++ src/theme/_fully_color.scss | 22 +++++++-------- src/theme/_proton_color.scss | 1 - 4 files changed, 90 insertions(+), 19 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8e2146a..6b845c1 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -157,6 +157,42 @@ #bookmarksPanel[lwt-sidebar="true"] { --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important; } + + /*= Menu color #477 ==========================================================*/ + @media (-moz-windows-non-native-menus) { + :root { + /* Override some menu color variables for light browser themes. */ + --menuitem-hover-background-color: #e0e0e6; + --menu-background-color: #f9f9fb; + --menu-color: #15141a; + --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4); + --menu-disabled-color: rgba(21, 20, 26, 0.4); + --menu-border-color: #cfcfd8; + --menu-icon-opacity: 0.7; + /* Declare menu colors for dark themes, but don't override anything yet. */ + --dark-menuitem-hover-background-color: #52525e; + --dark-menu-background-color: #2b2a33; + --dark-menu-color: #fbfbfe; + --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4); + --dark-menu-disabled-color: rgba(251, 251, 254, 0.4); + --dark-menu-border-color: #5b5b66; + --dark-menu-icon-opacity: 1; + } + + /* Override the menu color variables for dark browser themes. */ + } + @media (-moz-windows-non-native-menus) and (-moz-toolbar-prefers-color-scheme: dark), + (-moz-windows-non-native-menus) and (prefers-color-scheme: dark) { + :root { + --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color); + --menu-background-color: var(--dark-menu-background-color); + --menu-color: var(--dark-menu-color); + --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color); + --menu-disabled-color: var(--dark-menu-disabled-color); + --menu-border-color: var(--dark-menu-border-color); + --menu-icon-opacity: var(--dark-menu-icon-opacity); + } + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -1322,14 +1358,14 @@ html#main-window menupopup:not(.in-menulist) menuseparator { border-top: 1px solid var(--menu-border-color); } - html#main-window menupopup menu[disabled="true"], - html#main-window menupopup menu[_moz-menuactive="true"][disabled="true"], - html#main-window menupopup menuitem[disabled="true"], - html#main-window menupopup menuitem[_moz-menuactive="true"][disabled="true"] { + html#main-window menupopup:not(.in-menulist) menu[disabled="true"], + html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"], + html#main-window menupopup:not(.in-menulist) menuitem[disabled="true"], + html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"][disabled="true"] { color: var(--menu-disabled-color) !important; } - html#main-window menupopup menu[_moz-menuactive="true"]:not([disabled="true"]), - html#main-window menupopup menuitem[_moz-menuactive="true"]:not([disabled="true"]) { + html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"]:not([disabled="true"]), + html#main-window menupopup:not(.in-menulist) menuitem[_moz-menuactive="true"]:not([disabled="true"]) { background-color: var(--menuitem-hover-background-color) !important; color: var(--menu-color) !important; } @@ -1390,7 +1426,7 @@ window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] menupopup { /* Default Dark Mode */ --panel-color: var(--menu-color) !important; - --panel-background: var(--menu-background-color) !important; + --panel-background: var(--menu-background-color, -moz-menuhover) !important; } } /*== Info Bar Color ==========================================================*/ diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 3991c0d..ff7e352 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -134,3 +134,39 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { #bookmarksPanel[lwt-sidebar="true"] { --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important; } + +/*= Menu color #477 ==========================================================*/ +@media (-moz-windows-non-native-menus) { + :root { + /* Override some menu color variables for light browser themes. */ + --menuitem-hover-background-color: #e0e0e6; + --menu-background-color: #f9f9fb; + --menu-color: #15141a; + --menuitem-disabled-hover-background-color: rgba(224, 224, 230, 0.4); + --menu-disabled-color: rgba(21, 20, 26, 0.4); + --menu-border-color: #cfcfd8; + --menu-icon-opacity: 0.7; + + /* Declare menu colors for dark themes, but don't override anything yet. */ + --dark-menuitem-hover-background-color: #52525e; + --dark-menu-background-color: #2b2a33; + --dark-menu-color: #fbfbfe; + --dark-menuitem-disabled-hover-background-color: rgba(82, 82, 94, 0.4); + --dark-menu-disabled-color: rgba(251, 251, 254, 0.4); + --dark-menu-border-color: #5b5b66; + --dark-menu-icon-opacity: 1; + } + + /* Override the menu color variables for dark browser themes. */ + @include Dark { + :root { + --menuitem-hover-background-color: var(--dark-menuitem-hover-background-color); + --menu-background-color: var(--dark-menu-background-color); + --menu-color: var(--dark-menu-color); + --menuitem-disabled-hover-background-color: var(--dark-menuitem-disabled-hover-background-color); + --menu-disabled-color: var(--dark-menu-disabled-color); + --menu-border-color: var(--dark-menu-border-color); + --menu-icon-opacity: var(--dark-menu-icon-opacity); + } + } +} diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 67f48f6..bdff725 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -32,18 +32,18 @@ html#main-window menupopup:not(.in-menulist) { menuseparator { border-top: 1px solid var(--menu-border-color); } - } - menu, - menuitem { - &[disabled="true"], - &[_moz-menuactive="true"][disabled="true"] { - color: var(--menu-disabled-color) !important; - } + menu, + menuitem { + &[disabled="true"], + &[_moz-menuactive="true"][disabled="true"] { + color: var(--menu-disabled-color) !important; + } - &[_moz-menuactive="true"]:not([disabled="true"]) { - background-color: var(--menuitem-hover-background-color) !important; - color: var(--menu-color) !important; + &[_moz-menuactive="true"]:not([disabled="true"]) { + background-color: var(--menuitem-hover-background-color) !important; + color: var(--menu-color) !important; + } } } @@ -102,7 +102,7 @@ html#main-window menupopup:not(.in-menulist) { window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] menupopup { /* Default Dark Mode */ --panel-color: var(--menu-color) !important; - --panel-background: var(--menu-background-color) !important; + --panel-background: var(--menu-background-color, -moz-menuhover) !important; } } diff --git a/src/theme/_proton_color.scss b/src/theme/_proton_color.scss index cd69e70..cc44b85 100644 --- a/src/theme/_proton_color.scss +++ b/src/theme/_proton_color.scss @@ -156,4 +156,3 @@ --dialog-warning-text-color: var(--red-40); } } - From 48c17f313a626a295595f30a3d4e0a71d68f7f0a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 25 Sep 2022 18:49:53 +0900 Subject: [PATCH 10/15] Fix: Fully Theme - Light alphen glow's hover background #459 --- css/leptonChrome.css | 6 ++++++ src/theme/_fully_color.scss | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 31dfcd0..a11cdd5 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1387,6 +1387,12 @@ background-color: transparent !important; } } + @media (-moz-windows-non-native-menus) and (-moz-toolbar-prefers-color-scheme: light), + (-moz-windows-non-native-menus) and (prefers-color-scheme: light) { + :root[style*="background-noodles-right"] menupopup { + --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099) !important; + } + } @media not all and (-moz-gtk-csd-available) { window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menupopup { --panel-color: var(--lwt-sidebar-text-color, var(--menu-color)) !important; diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index bdff725..3f230c7 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -58,6 +58,13 @@ html#main-window menupopup:not(.in-menulist) { } } } + + @include Light { + :root[style*="background-noodles-right"] menupopup { + // Alphen Glow Theme - Like darkmode + --toolbarbutton-hover-background: rgba(232, 224, 255, 0.11999999731779099)!important; + } + } } // TODO: `OS` not covered case From da8e4c202b6e56a2e889e037cf68facbe9047de9 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 27 Sep 2022 19:55:03 +0900 Subject: [PATCH 11/15] Fix: Icons - Panel's update icon color, padding --- css/leptonChrome.css | 4 +++- src/icons/layout/_panel.scss | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index a11cdd5..aff97c4 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8678,6 +8678,8 @@ #appMenu-proton-update-banner .toolbarbutton-text { margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + /* FF v107 */ } #appMenu-multiView .subviewbutton::before, @@ -8724,7 +8726,7 @@ #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before, #downloadsHistory .button-icon, - .subviewbutton > image { + .subviewbutton:not(#appMenu-proton-update-banner) > image { fill: currentColor !important; fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; -moz-context-properties: fill !important; diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index 546fd63..972f3d7 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -39,6 +39,7 @@ } #appMenu-proton-update-banner .toolbarbutton-text { margin-inline-start: 0 !important; + padding-inline-start: 0 !important; /* FF v107 */ } #appMenu-multiView .subviewbutton::before, @@ -80,7 +81,7 @@ #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before, #downloadsHistory .button-icon, -.subviewbutton > image { +.subviewbutton:not(#appMenu-proton-update-banner) > image { fill: currentColor !important; fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; -moz-context-properties: fill !important; From 2564a0afa49c54d9c48c0c6ae33539b69a2768dd Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 28 Sep 2022 13:15:55 +0900 Subject: [PATCH 12/15] Fix: Tabbar Height - Makes non fixed #476 It may also affect the compatibility with the old browser. --- css/leptonChrome.css | 20 +++++++++++--------- src/compatibility/_os.scss | 11 ++++++----- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index aff97c4..c7d5561 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -382,16 +382,18 @@ } } /*= Titlebar Container Size at maximized #384 ================================*/ - @supports -moz-bool-pref("userChrome.compatibility.os.windows_maximized") { - @media (-moz-os-version: windows-win7), - (-moz-platform: windows-win7), - (-moz-os-version: windows-win8), - (-moz-platform: windows-win8), - (-moz-os-version: windows-win10), - (-moz-platform: windows-win10) { + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { + :root[tabsintitlebar][sizemode="maximized"] #titlebar { + /* -moz-default-appearance: -moz-window-titlebar */ + appearance: none !important; + } + @supports -moz-bool-pref("userChrome.compatibility.os.windows_maximized") { :root[tabsintitlebar][sizemode="maximized"] #titlebar { - /* -moz-default-appearance: -moz-window-titlebar */ - appearance: none !important; padding-top: 8px; } } diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 59dde54..9aea212 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -183,12 +183,13 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5); } /*= Titlebar Container Size at maximized #384 ================================*/ -@include Option("userChrome.compatibility.os.windows_maximized") { - @include OS($win) { - :root[tabsintitlebar][sizemode="maximized"] #titlebar { - /* -moz-default-appearance: -moz-window-titlebar */ - appearance: none !important; +@include OS($win) { + :root[tabsintitlebar][sizemode="maximized"] #titlebar { + // Prevent #476 FF v105 above + /* -moz-default-appearance: -moz-window-titlebar */ + appearance: none !important; + @include Option("userChrome.compatibility.os.windows_maximized") { // Prevent sideeffect #370 padding-top: 8px; // Don't use margin-top for reserved fullscreen animation } From 1614921f0c88ed427943964621d689c77a493bb8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 29 Sep 2022 18:34:22 +0900 Subject: [PATCH 13/15] Fix: Tabbar Height - Normal, Fullscreen mode #476 --- css/leptonChrome.css | 9 ++++++--- src/compatibility/_os.scss | 21 ++++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index c7d5561..2431dfc 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -388,12 +388,15 @@ (-moz-platform: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root[tabsintitlebar][sizemode="maximized"] #titlebar { - /* -moz-default-appearance: -moz-window-titlebar */ - appearance: none !important; + @supports not -moz-bool-pref("userChrome.compatibility.os.windows_maximized") { + :root[tabsintitlebar] #titlebar { + /* -moz-default-appearance: -moz-window-titlebar */ + appearance: none !important; + } } @supports -moz-bool-pref("userChrome.compatibility.os.windows_maximized") { :root[tabsintitlebar][sizemode="maximized"] #titlebar { + appearance: none !important; padding-top: 8px; } } diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 9aea212..c3a3ebf 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -184,14 +184,21 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5); /*= Titlebar Container Size at maximized #384 ================================*/ @include OS($win) { - :root[tabsintitlebar][sizemode="maximized"] #titlebar { - // Prevent #476 FF v105 above - /* -moz-default-appearance: -moz-window-titlebar */ - appearance: none !important; - + :root[tabsintitlebar] { + @include NotOption("userChrome.compatibility.os.windows_maximized") { + #titlebar { + // Prevent #476 FF v105 above + /* -moz-default-appearance: -moz-window-titlebar */ + appearance: none !important; + } + } @include Option("userChrome.compatibility.os.windows_maximized") { - // Prevent sideeffect #370 - padding-top: 8px; // Don't use margin-top for reserved fullscreen animation + &[sizemode="maximized"] #titlebar { + appearance: none !important; + + // Prevent sideeffect #370 + padding-top: 8px; // Don't use margin-top for reserved fullscreen animation + } } } } From 19530cc7eff02128db8bd5e000afbc45d5317a7b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 29 Sep 2022 18:07:30 +0900 Subject: [PATCH 14/15] Fix: Icon - Panel's update icon padding --- css/leptonChrome.css | 5 +---- src/icons/layout/_panel.scss | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2431dfc..0e0a801 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8697,10 +8697,7 @@ #appMenu-proton-update-banner { margin-bottom: 2px !important; - } - - #appMenu-proton-update-banner::before { - margin-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; + padding-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; } #appMenu-fxa-status2, diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index 972f3d7..bce5576 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -51,9 +51,7 @@ } #appMenu-proton-update-banner { margin-bottom: 2px !important; -} -#appMenu-proton-update-banner::before { - margin-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; + padding-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; } #appMenu-fxa-status2, #appMenu-zoom-controls2, /* Legacy v104 */ From e4a235b590e1c8565c92a199ea6301526c5feb1f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 4 Oct 2022 04:50:10 +0900 Subject: [PATCH 15/15] Doc: update CREDITS #474 --- CREDITS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CREDITS b/CREDITS index dfa5214..0a4527e 100644 --- a/CREDITS +++ b/CREDITS @@ -30,6 +30,9 @@ N: Ajith-stark E: ajith.kum.12342@gmail.com W: https://github.com/Ajith-stark +N: akay +W: https://github.com/akay + N: Andmagdo W: https://github.com/andmagdo