From 603b7076518f726ebdfc84136b8f8eec94e34471 Mon Sep 17 00:00:00 2001 From: adamp01 Date: Mon, 24 Oct 2022 12:21:40 +0100 Subject: [PATCH 01/11] Fix: Rounding - allow squaring of additional findbar buttons --- css/leptonChrome.css | 3 ++- src/rounding/_square.scss | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 22962e4..81b21e3 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3226,7 +3226,8 @@ /* Original: 4px */ } - button { + button, + findbar toolbarbutton { border-radius: 0 !important; } } diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 139f7bb..35355c6 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -7,7 +7,9 @@ :root { --toolbarbutton-border-radius: 0 !important; /* Original: 4px */ } - button { + + button, + findbar toolbarbutton { border-radius: 0 !important; } } From f04799349c7837b4b7d955e6223706a656af4a71 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 24 Oct 2022 21:32:04 +0900 Subject: [PATCH 02/11] Fix: Autohide - Mac's titlebar container hide #494 --- css/leptonChrome.css | 39 +++++++++++++++++++++++++-------------- src/autohide/_tabbar.scss | 7 +++++-- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 81b21e3..8dfc4b2 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7979,16 +7979,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -7996,7 +7998,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8013,16 +8016,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -8030,7 +8035,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8046,16 +8052,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -8063,7 +8071,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8082,7 +8091,8 @@ } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important; } @@ -8101,7 +8111,8 @@ transition-delay: 0s !important; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]), + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition-delay: 0s !important; } } diff --git a/src/autohide/_tabbar.scss b/src/autohide/_tabbar.scss index 3f2bda9..fe377cb 100644 --- a/src/autohide/_tabbar.scss +++ b/src/autohide/_tabbar.scss @@ -1,7 +1,10 @@ //-- Mixin --------------------------------------------------------------------- @mixin _autohide_tabbar() { @include NotOption("userChrome.tabbar.on_bottom") { - @content; + &, + & .titlebar-buttonbox-container { + @content; + } } @include Option("userChrome.tabbar.on_bottom") { > *:not(.titlebar-buttonbox-container) { @@ -20,8 +23,8 @@ #TabsToolbar:not([customizing]) { @include _autohide_tabbar { opacity: 0; - will-change: opacity; } + will-change: opacity; } #navigator-toolbox:is(:hover, :focus-within) { From c738e01009277ad175c001f75fff659e644d7c45 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 25 Oct 2022 10:43:10 +0900 Subject: [PATCH 03/11] Fix: Icons - Mac's contents area --- css/leptonChrome.css | 2 +- src/icons/context_menu/_content_area.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8dfc4b2..bb1ad93 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10249,7 +10249,7 @@ /* iconic */ } - @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #context-back { --menuitem-image: url("chrome://browser/skin/back.svg"); } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index c74e829..14d7716 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -243,7 +243,7 @@ /* iconic */ } -@include NativeMenu { +@include OS($mac) { #context-back { --menuitem-image: url("chrome://browser/skin/back.svg"); } From b456d5ca0646469a709ed91dcaa030e9ba78a396 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Oct 2022 15:47:05 +0900 Subject: [PATCH 04/11] Fix: Rounding - Square field apply for urlbar, searchbar --- css/leptonChrome.css | 5 +++++ src/rounding/_square.scss | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index bb1ad93..2e18b09 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3271,6 +3271,11 @@ html|input { border-radius: 0 !important; } + + #urlbar-background, + #searchbar { + --toolbarbutton-border-radius: 0; + } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { .checkbox-check, diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 35355c6..fa92deb 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -56,6 +56,11 @@ html|input { border-radius: 0 !important; } + + #urlbar-background, + #searchbar { + --toolbarbutton-border-radius: 0; + } } @include Option("userChrome.rounding.square_checklabel") { From 1cbcb9a9f16fdf5b548000ad35fa198b587c7cfb Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Oct 2022 15:55:26 +0900 Subject: [PATCH 05/11] Fix: Autohide - Urlbar over bookmarkbar --- css/leptonChrome.css | 4 ++++ src/autohide/_common.scss | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2e18b09..11bbbdc 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7853,6 +7853,10 @@ z-index: 3; } } + #PersonalToolbar { + z-index: -1; + } + #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss index a34b0f8..185d6c9 100644 --- a/src/autohide/_common.scss +++ b/src/autohide/_common.scss @@ -45,6 +45,10 @@ } } + #PersonalToolbar { + z-index: -1; + } + #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; From 3315105d1dd6caea9cd0ebe0b20b6cb771c9e25f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 28 Oct 2022 18:46:15 +0900 Subject: [PATCH 06/11] Fix: Icon - Replace save file icon #496 --- css/leptonChrome.css | 10 +++++----- css/leptonContent.css | 2 +- icons/toolbarButton-download.svg | 4 ++++ src/icons/_global_menu.scss | 2 +- src/icons/_library.scss | 2 +- src/icons/_panel.scss | 2 +- src/icons/context_menu/_content_area.scss | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 icons/toolbarButton-download.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 11bbbdc..d5b3715 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8941,7 +8941,7 @@ @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-save-file-button2 { - list-style-image: url("chrome://browser/skin/save.svg"); + list-style-image: url("../icons/toolbarButton-download.svg"); } #appMenu-find-button2 { @@ -10016,7 +10016,7 @@ } #context-savelink { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-savelinktopocket { @@ -10146,7 +10146,7 @@ } #context-savepage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-pocket { @@ -10744,7 +10744,7 @@ } #menu_savePage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { @@ -11112,7 +11112,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { diff --git a/css/leptonContent.css b/css/leptonContent.css index 03b4729..09697f5 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -3403,7 +3403,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg new file mode 100644 index 0000000..651e702 --- /dev/null +++ b/icons/toolbarButton-download.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index fc6d034..0c20225 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -27,7 +27,7 @@ } #menu_savePage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { --menuitem-image: url("chrome://browser/skin/mail.svg"); diff --git a/src/icons/_library.scss b/src/icons/_library.scss index fc2b57b..a65d505 100644 --- a/src/icons/_library.scss +++ b/src/icons/_library.scss @@ -55,7 +55,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { --menuitem-image: url("chrome://browser/skin/open.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index cad45e4..9ff4cb7 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -88,7 +88,7 @@ } @include Option("userChrome.icon.panel_full") { #appMenu-save-file-button2 { - list-style-image: url("chrome://browser/skin/save.svg"); + list-style-image: url("../icons/toolbarButton-download.svg"); } #appMenu-find-button2 { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 14d7716..8655845 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -45,7 +45,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #context-savelink { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-savelinktopocket { --menuitem-image: url("../icons/pocket-outline.svg"); @@ -148,7 +148,7 @@ } #context-savepage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-pocket { --menuitem-image: url("../icons/pocket-outline.svg"); From af94a48997b15eb73502f0f0bc1cb06c902ab44f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 28 Oct 2022 19:13:14 +0900 Subject: [PATCH 07/11] Fix: Icon - Adjust `file save`'s size #496 --- icons/toolbarButton-download.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg index 651e702..6d64757 100644 --- a/icons/toolbarButton-download.svg +++ b/icons/toolbarButton-download.svg @@ -1,4 +1,4 @@ - - + + From 78e3fe21915c81d7be5cd7c63fe2b8f7acd7538c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 29 Oct 2022 13:03:57 +0900 Subject: [PATCH 08/11] Fix: Fully Color - Sidebar context menu hover color #495 --- css/leptonChrome.css | 1 + src/theme/_fully_color.scss | 2 ++ 2 files changed, 3 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index d5b3715..ccbf8ec 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1420,6 +1420,7 @@ /* or var(--lwt-sidebar-highlight-background-color) If this value is used, unset is required in the default theme. */ + background-color: var(--menuitem-hover-background-color) !important; } /* Fallback background - Set to Legacy. It will be removed Next update diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 3f230c7..fc20cf7 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -84,6 +84,8 @@ html#main-window menupopup:not(.in-menulist) { /* or var(--lwt-sidebar-highlight-background-color) If this value is used, unset is required in the default theme. */ + + background-color: var(--menuitem-hover-background-color) !important; } /* Fallback background - Set to Legacy. It will be removed Next update From ebef2205517b61656a6d35b61c6d0e3052d6959f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 1 Nov 2022 23:23:49 +0900 Subject: [PATCH 09/11] Fix: Tab Bar - Connected at `Ambiance` theme #499 --- css/leptonChrome.css | 2 +- src/tab/_connect_to_window.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index ccbf8ec..6542a87 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6202,7 +6202,7 @@ } #TabsToolbar:not([multibar]) { - overflow: hidden; + overflow: clip; /* Prevent toolbar area over */ } diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index cd05b30..11ffa74 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -17,7 +17,7 @@ z-index: 1 !important; } #TabsToolbar:not([multibar]) { - overflow: hidden; /* Prevent toolbar area over */ + overflow: clip; /* Prevent toolbar area over */ } /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ From b4b9e295a31e6933b250c38e1c9dcd3f687a6573 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 2 Nov 2022 18:09:36 +0900 Subject: [PATCH 10/11] Add: Unified Extenstion Panel Supports - `extensions.unifiedExtensions.enabled` to `true` --- css/leptonChrome.css | 22 +++++++++++++++++++++- src/decoration/_cursor.scss | 4 +++- src/icons/_panel.scss | 5 +++++ src/icons/context_menu/_others.scss | 11 +++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 6542a87..df39d84 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2939,7 +2939,9 @@ #protections-popup-footer .protections-popup-footer-button, #protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, - #identity-popup-more-info { + #identity-popup-more-info, + #unified-extensions-manage-extensions, + .unified-extensions-item-open-menu { cursor: pointer !important; } @@ -9364,6 +9366,11 @@ #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); } + + /*= unified-extensions-view ===================================================*/ + #unified-extensions-manage-extensions { + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); + } } /** Menu - Icons Layout *******************************************************/ @supports -moz-bool-pref("userChrome.icon.menu") { @@ -10690,6 +10697,19 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } + + /*= unified-extensions-context-menu ==========================================*/ + .unified-extensions-context-menu-manage-extension { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + + .unified-extensions-context-menu-remove-extension { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + + .unified-extensions-context-menu-report-extension { + --menuitem-image: url("../icons/send.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ diff --git a/src/decoration/_cursor.scss b/src/decoration/_cursor.scss index 7166ca9..74aec7c 100644 --- a/src/decoration/_cursor.scss +++ b/src/decoration/_cursor.scss @@ -21,7 +21,9 @@ menuitem.openintabs-menuitem, #protections-popup-footer .protections-popup-footer-button, #protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, -#identity-popup-more-info { +#identity-popup-more-info, +#unified-extensions-manage-extensions, +.unified-extensions-item-open-menu { cursor: pointer !important; } diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 9ff4cb7..575208c 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -473,3 +473,8 @@ panelMenuBookmarkThisPage[starred] { #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); } + +/*= unified-extensions-view ===================================================*/ +#unified-extensions-manage-extensions { + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); +} diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 25f28d8..04c48cc 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -213,3 +213,14 @@ menuitem.searchbar-clear-history { #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } + +/*= unified-extensions-context-menu ==========================================*/ +.unified-extensions-context-menu-manage-extension { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +.unified-extensions-context-menu-remove-extension { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); +} +.unified-extensions-context-menu-report-extension { + --menuitem-image: url("../icons/send.svg"); +} From aff13a5984c53aca5a3282a34dacb64e5014c0c7 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 02:55:46 +0900 Subject: [PATCH 11/11] Fix: AutoHide - Adjust interaction area #501 --- css/leptonChrome.css | 11 ++++++----- src/autohide/_common.scss | 14 ++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index df39d84..3e5bbd6 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7841,10 +7841,15 @@ or -moz-bool-pref("userChrome.autohide.infobar") { #navigator-toolbox { position: relative; + } + #navigator-toolbox:is(:hover, :focus-within) { z-index: 2; } + #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar { + z-index: -1; + } - #navigator-toolbox:not(:hover) { + #navigator-toolbox:not(:hover):not(:focus-within) { animation: 1s keepfront; } @@ -7856,10 +7861,6 @@ z-index: 3; } } - #PersonalToolbar { - z-index: -1; - } - #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss index 185d6c9..1fde6d6 100644 --- a/src/autohide/_common.scss +++ b/src/autohide/_common.scss @@ -31,9 +31,15 @@ @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.autohide.infobar") { #navigator-toolbox { position: relative; - z-index: 2; + &:is(:hover, :focus-within) { + z-index: 2; + + #PersonalToolbar { + z-index: -1; + } + } } - #navigator-toolbox:not(:hover) { + #navigator-toolbox:not(:hover):not(:focus-within) { animation: 1s keepfront; } @keyframes keepfront { @@ -45,10 +51,6 @@ } } - #PersonalToolbar { - z-index: -1; - } - #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important;