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 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 diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 10ede0d..0e0a801 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -145,6 +145,54 @@ 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; + } + + /*= 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") { @@ -289,7 +337,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; } @@ -334,16 +382,21 @@ } } /*= 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) { - :root[tabsintitlebar][sizemode="maximized"] #titlebar { + @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) { + @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; } } @@ -1310,14 +1363,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; } @@ -1339,6 +1392,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; @@ -1378,7 +1437,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 ==========================================================*/ @@ -2720,6 +2779,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 { @@ -3214,13 +3277,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") { @@ -3385,18 +3456,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)); } } } @@ -3406,18 +3477,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) { @@ -3425,13 +3496,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; } } } @@ -3443,13 +3514,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; } } } @@ -4292,6 +4363,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } @@ -4335,7 +4407,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 { @@ -4406,6 +4480,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } @@ -4449,7 +4524,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 { @@ -7378,6 +7455,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 +8220,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 +8229,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 +8267,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; @@ -8600,6 +8683,8 @@ #appMenu-proton-update-banner .toolbarbutton-text { margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + /* FF v107 */ } #appMenu-multiView .subviewbutton::before, @@ -8612,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, @@ -8646,7 +8728,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/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/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/compatibility/_os.scss b/src/compatibility/_os.scss index 905289e..c3a3ebf 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; } @@ -183,14 +183,22 @@ $_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] { + @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") { + &[sizemode="maximized"] #titlebar { + appearance: none !important; - // Prevent sideeffect #370 - padding-top: 8px; // Don't use margin-top for reserved fullscreen animation + // Prevent sideeffect #370 + padding-top: 8px; // Don't use margin-top for reserved fullscreen animation + } } } } diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 0d43087..ff7e352 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -123,3 +123,50 @@ 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; +} + +/*= 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/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index 546fd63..bce5576 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, @@ -50,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 */ @@ -80,7 +79,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/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 -------------------------------------------------------------*/ 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/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; diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss index 4742d4f..540d2ad 100644 --- a/src/tabbar/_one_liner.scss +++ b/src/tabbar/_one_liner.scss @@ -27,6 +27,7 @@ } #navigator-toolbox { + position: relative; z-index: 2; } @@ -71,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 { diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 67f48f6..3f230c7 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; + } } } @@ -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 @@ -102,7 +109,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); } } - diff --git a/user.js b/user.js index 6fd773e..4d50428 100644 --- a/user.js +++ b/user.js @@ -66,7 +66,7 @@ user_pref("userChrome.rounding.square_tab", true); // 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 ==================================================== @@ -116,6 +116,7 @@ user_pref("userChrome.rounding.square_tab", true); // 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);