From 41acca6f96dc7fa98ca09097421819b4448ca893 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 18 Feb 2024 23:54:17 +0900 Subject: [PATCH] Fix: Hidden - Tabbar padding and title container opacity #810 --- css/leptonChrome.css | 144 ++++++++++++++++++------- css/leptonChromeESR.css | 54 ++++++++++ src/tabbar/layout/_window_control.scss | 14 ++- 3 files changed, 175 insertions(+), 37 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 23f5b55d..405d43e2 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -5325,9 +5325,6 @@ } } @media (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -5398,6 +5395,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -5472,9 +5478,6 @@ } } @media (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -5545,6 +5548,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -5616,9 +5628,6 @@ } } @media (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -5689,6 +5698,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -5769,9 +5787,6 @@ } } @media screen and (max-width: 1100px) and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -5851,6 +5866,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } } @media screen and (max-width: 1100px) { @@ -5929,9 +5953,6 @@ } } @media screen and (min-width: 1100px) and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -6002,6 +6023,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -6075,9 +6105,6 @@ } } @media screen and (min-width: 1100px) and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -6148,6 +6175,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -18995,9 +19031,6 @@ (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar") and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -19106,6 +19139,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.tabbar.on_bottom"), (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (not (-moz-bool-pref: "userChrome.tabbar.one_liner")) and (-moz-bool-pref: "userChrome.hidden.tabbar"), @@ -19213,9 +19255,6 @@ @media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -19300,6 +19339,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"), (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"), @@ -19401,9 +19449,6 @@ @media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows), (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -19488,6 +19533,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"), (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive")) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"), @@ -19619,9 +19673,6 @@ screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px) and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px) and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -19730,6 +19781,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (max-width: 1100px), screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (-moz-bool-pref: "userChrome.hidden.tabbar") and (max-width: 1100px), @@ -19837,9 +19897,6 @@ @media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first") and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -19924,6 +19981,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"), screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "userChrome.tabbar.one_liner.tabbar_first"), @@ -20025,9 +20091,6 @@ @media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows), screen and (-moz-bool-pref: "userChrome.hidden.tabbar") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-platform: windows) { - :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; - } :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } @@ -20112,6 +20175,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } @media screen and (-moz-bool-pref: "userChrome.tabbar.on_bottom") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"), screen and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (not (-moz-bool-pref: "userChrome.hidden.titlebar_container")) and (-moz-bool-pref: "userChrome.tabbar.one_liner") and (-moz-bool-pref: "userChrome.tabbar.one_liner.responsive") and (min-width: 1100px) and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled"), diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f94f632c..97612bed 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -5780,6 +5780,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -5930,6 +5939,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -6077,6 +6095,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -6243,6 +6270,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } } @media screen and (max-width: 1100px) { @@ -6398,6 +6434,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) @@ -6548,6 +6593,15 @@ :root[inFullscreen]:not([macOSNativeFullscreen]) #menubar-items { visibility: collapse !important; } + :root[tabsintitlebar] #titlebar { + z-index: 1; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive { + opacity: 1 !important; + } + :root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } } /* At Activated Menubar */ :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) diff --git a/src/tabbar/layout/_window_control.scss b/src/tabbar/layout/_window_control.scss index bcb07fc6..2c451488 100644 --- a/src/tabbar/layout/_window_control.scss +++ b/src/tabbar/layout/_window_control.scss @@ -54,7 +54,9 @@ See the above repository for updates as well as full license text. */ @include OS($win) { :root[sizemode="maximized"][tabsintitlebar] { - --uc-titlebar-padding: 8px; + @if mode.isESR() { + --uc-titlebar-padding: 8px; + } #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); @@ -127,6 +129,16 @@ See the above repository for updates as well as full license text. */ visibility: collapse !important; } } + + :root[tabsintitlebar] #titlebar { + z-index: 1; + &:-moz-window-inactive { + opacity: 1 !important; + .titlebar-buttonbox { + opacity: var(--inactive-titlebar-opacity); + } + } + } } /* At Activated Menubar */