diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 13efdb5..dd84334 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -185,9 +185,14 @@ (-moz-platform: windows-win7), (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - /* Header Color */ - :root:not([lwtheme-image]):-moz-lwtheme { - background-color: var(--lwt-accent-color) !important; + @supports not -moz-bool-pref("userChrome.theme.transparent.frame") { + /* Header Color */ + :root:not([lwtheme-image]):-moz-lwtheme { + background-color: var(--lwt-accent-color) !important; + } + :root:not([lwtheme-image]):-moz-lwtheme:-moz-window-inactive { + background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important; + } } } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { @@ -2175,7 +2180,11 @@ } /*= Transparent ==============================================================*/ @supports -moz-bool-pref("userChrome.theme.transparent.frame") { - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10), (-moz-gtk-csd-available) { + @media (-moz-os-version: windows-win10), + (-moz-platform: windows-win10), + (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-gtk-csd-available) { #main-window, #navigator-toolbox-background { background-color: transparent !important; @@ -2199,27 +2208,7 @@ -moz-default-appearance: -moz-win-exclude-glass !important; } } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root, - #navigator-toolbox { - --lwt-accent-color: transparent !important; - --lwt-text-color: WindowText !important; - } - #titlebar .toolbarbutton-1 { - --toolbarbutton-icon-fill: var(--lwt-text-color) !important; - } - :root:not([sizemode="fullscreen"]) .titlebar-buttonbox-container .titlebar-button:not(.titlebar-close:hover) { - list-style-image: none !important; - } - :root:not([sizemode="fullscreen"]) - #toolbar-menubar[autohide="true"][inactive="true"] - + #TabsToolbar - .titlebar-button:is(.titlebar-close:hover) - .toolbarbutton-icon { - transform: translateY(-7px) !important; - } - } - @media (-moz-gtk-csd-available) { + @media (-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; @@ -2242,7 +2231,7 @@ } #main-menubar:not(:-moz-window-inactive), .titlebar-buttonbox-container:not(:-moz-window-inactive) { - background-color: var(--uc-frame-element-background); + background-color: var(--uc-frame-element-background) !important; border-radius: 4px; } #TabsToolbar { @@ -2264,6 +2253,46 @@ background-color: var(--uc-frame-element-background); } } + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + :root, + #navigator-toolbox { + --lwt-accent-color: transparent !important; + --lwt-text-color: WindowText !important; + } + #titlebar .toolbarbutton-1 { + --toolbarbutton-icon-fill: var(--lwt-text-color) !important; + } + :root:not([sizemode="fullscreen"]) .titlebar-buttonbox-container .titlebar-button:not(.titlebar-close:hover) { + list-style-image: none !important; + } + :root:not([sizemode="fullscreen"]) + #toolbar-menubar[autohide="true"][inactive="true"] + + #TabsToolbar + .titlebar-button:is(.titlebar-close:hover) + .toolbarbutton-icon { + transform: translateY(-7px) !important; + } + } + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + :root:not([lwtheme-image]):-moz-lwtheme { + background-color: transparent !important; + background-image: none !important; + } + #main-menubar:not(:-moz-window-inactive) { + color: var(--lwt-text-color) !important; + } + @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { + #toolbar-menubar:not(:-moz-window-inactive) { + text-shadow: unset !important; + } + } + @media (-moz-windows-default-theme) { + #TabsToolbar { + color: inherit !important; + background-image: unset !important; + } + } + } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { :root:not(:-moz-window-inactive) #navigator-toolbox { background-color: transparent !important; diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index 1f3a14b..a0ab63c 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -20,9 +20,15 @@ /*= Windows 7, 8 - Tab Bar Background *****************************************/ @include OS($win7, $win8) { - /* Header Color */ - :root:not([lwtheme-image]):-moz-lwtheme { - background-color: var(--lwt-accent-color) !important; + @include NotOption("userChrome.theme.transparent.frame") { + /* Header Color */ + :root:not([lwtheme-image]):-moz-lwtheme { + background-color: var(--lwt-accent-color) !important; + + &:-moz-window-inactive { + background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important; + } + } } } diff --git a/src/theme/_transparent.scss b/src/theme/_transparent.scss index dc8ab1c..e37aeb7 100644 --- a/src/theme/_transparent.scss +++ b/src/theme/_transparent.scss @@ -1,11 +1,14 @@ -@include OS($win10, $linux) { +@include OS($win10, $win7, $linux) { @import "transparent/general"; } +@include OS($win7, $linux) { + @import "transparent/general_element_background"; +} @include OS($win10) { @import "transparent/win11"; } -@include OS($linux) { - @import "transparent/linux"; +@include OS($win7) { + @import "transparent/win7"; } @include OS($mac) { @import "transparent/mac"; diff --git a/src/theme/transparent/_general.scss b/src/theme/transparent/_general.scss index 5f8db87..b838e21 100644 --- a/src/theme/transparent/_general.scss +++ b/src/theme/transparent/_general.scss @@ -9,6 +9,7 @@ background-color: transparent !important; background-image: none !important; } + #nav-bar, #PersonalToolbar { background-image: linear-gradient( diff --git a/src/theme/transparent/_linux.scss b/src/theme/transparent/_general_element_background.scss similarity index 96% rename from src/theme/transparent/_linux.scss rename to src/theme/transparent/_general_element_background.scss index 90eac2b..7a85fa9 100644 --- a/src/theme/transparent/_linux.scss +++ b/src/theme/transparent/_general_element_background.scss @@ -28,7 +28,7 @@ #main-menubar:not(:-moz-window-inactive), .titlebar-buttonbox-container:not(:-moz-window-inactive) { - background-color: var(--uc-frame-element-background); + background-color: var(--uc-frame-element-background) !important; border-radius: 4px; } diff --git a/src/theme/transparent/_win7.scss b/src/theme/transparent/_win7.scss new file mode 100644 index 0000000..0fe1f03 --- /dev/null +++ b/src/theme/transparent/_win7.scss @@ -0,0 +1,21 @@ +:root:not([lwtheme-image]):-moz-lwtheme { + background-color: transparent !important; + background-image: none !important; +} + +#main-menubar:not(:-moz-window-inactive) { + color: var(--lwt-text-color) !important; +} + +@include Dark { + #toolbar-menubar:not(:-moz-window-inactive) { + text-shadow: unset !important; + } +} + +@media (-moz-windows-default-theme) { + #TabsToolbar { + color: inherit !important; + background-image: unset !important; + } +}