author | Gijs Kruitbosch <gijskruitbosch@gmail.com> |
Wed, 03 Jun 2015 23:21:31 +0100 | |
changeset 248122 | 0d0fbf21e23e4168a40e85b157e0f4404365fe86 |
parent 248121 | 9f6666bd7a9b1056d4c22b87122b4fdbc508723c |
child 248123 | 09369dc533d36ca9204d165536acd32b87906dd1 |
push id | 60888 |
push user | kwierso@gmail.com |
push date | Thu, 11 Jun 2015 01:38:38 +0000 |
treeherder | mozilla-inbound@39e638ed06bf [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dao |
bugs | 1169911 |
milestone | 41.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/themes/windows/browser-aero.css +++ b/browser/themes/windows/browser-aero.css @@ -103,24 +103,46 @@ display: none; } #main-window[sizemode="maximized"] #titlebar-buttonbox { -moz-margin-end: 3px; } #main-window { - -moz-appearance: -moz-win-borderless-glass; + -moz-appearance: -moz-win-glass; background: transparent; } - #appcontent { + /* On win10, if we don't set this on the entire browser container including + * the sidebar, if the sidebar is open the accent color bleeds through in + * the titlebar */ + #browser { -moz-appearance: -moz-win-exclude-glass; } + @media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { + #main-window { + -moz-appearance: -moz-win-borderless-glass; + } + + /* The borders on the glass frame are ours, and inside #browser, and on + * vista and win7 we want to make sure they are "glassy", so we can't use + * #browser as the exclude-glass container. We use #appcontent instead. */ + #browser { + -moz-appearance: none; + } + + #appcontent { + -moz-appearance: -moz-win-exclude-glass; + } + } + + /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */ #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme { border-top: 2px solid; -moz-border-top-colors: @glassActiveBorderColor@ rgba(255,255,255,.6); } #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive { -moz-border-top-colors: @glassInactiveBorderColor@ rgba(255,255,255,.6);