diff --git a/css/leptonChrome.css b/css/leptonChrome.css index dd84334..d741dfd 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2182,6 +2182,8 @@ @supports -moz-bool-pref("userChrome.theme.transparent.frame") { @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-gtk-csd-available) { @@ -2208,7 +2210,11 @@ -moz-default-appearance: -moz-win-exclude-glass !important; } } - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-gtk-csd-available) { + @media (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) { --lwt-accent-color: Window !important; --lwt-text-color: WindowText !important; @@ -2229,11 +2235,23 @@ ); } } - #main-menubar:not(:-moz-window-inactive), - .titlebar-buttonbox-container:not(:-moz-window-inactive) { - background-color: var(--uc-frame-element-background) !important; + #main-menubar { border-radius: 4px; } + #main-menubar:not(:-moz-window-inactive) { + background-color: var(--uc-frame-element-background) !important; + } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { + #main-menubar:-moz-window-inactive { + background-color: var(--uc-frame-element-background) !important; + } + } + @media (-moz-gtk-csd-available) { + .titlebar-buttonbox-container:not(:-moz-window-inactive) { + background-color: var(--uc-frame-element-background) !important; + border-radius: 4px; + } + } #TabsToolbar { --toolbarseparator-color: transparent; } @@ -2273,7 +2291,10 @@ transform: translateY(-7px) !important; } } - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + @media (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win7), + (-moz-platform: windows-win7) { :root:not([lwtheme-image]):-moz-lwtheme { background-color: transparent !important; background-image: none !important; diff --git a/src/theme/_transparent.scss b/src/theme/_transparent.scss index e37aeb7..e36563f 100644 --- a/src/theme/_transparent.scss +++ b/src/theme/_transparent.scss @@ -1,14 +1,14 @@ -@include OS($win10, $win7, $linux) { +@include OS($win10, $win8, $win7, $linux) { @import "transparent/general"; } -@include OS($win7, $linux) { +@include OS($win8, $win7, $linux) { @import "transparent/general_element_background"; } @include OS($win10) { @import "transparent/win11"; } -@include OS($win7) { - @import "transparent/win7"; +@include OS($win8, $win7) { + @import "transparent/win7_8"; } @include OS($mac) { @import "transparent/mac"; diff --git a/src/theme/transparent/_general_element_background.scss b/src/theme/transparent/_general_element_background.scss index 7a85fa9..fc375cb 100644 --- a/src/theme/transparent/_general_element_background.scss +++ b/src/theme/transparent/_general_element_background.scss @@ -26,10 +26,23 @@ } } -#main-menubar:not(:-moz-window-inactive), -.titlebar-buttonbox-container:not(:-moz-window-inactive) { - background-color: var(--uc-frame-element-background) !important; +#main-menubar { border-radius: 4px; + + &:not(:-moz-window-inactive) { + background-color: var(--uc-frame-element-background) !important; + } + @include OS($win8) { + &:-moz-window-inactive { + background-color: var(--uc-frame-element-background) !important; + } + } +} +@include OS($linux) { + .titlebar-buttonbox-container:not(:-moz-window-inactive) { + background-color: var(--uc-frame-element-background) !important; + border-radius: 4px; + } } #TabsToolbar { diff --git a/src/theme/transparent/_win7.scss b/src/theme/transparent/_win7_8.scss similarity index 100% rename from src/theme/transparent/_win7.scss rename to src/theme/transparent/_win7_8.scss