From c5dcddab17e4b03fb43686044e5cd58cef29f24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 29 Sep 2017 12:47:11 +0200
Subject: [PATCH] Bug 1404286 - Let the border between tabs and navigation
 toolbar use the standard chrome-on-glass border color on Windows 7. r=johannh

MozReview-Commit-ID: C4wLFhnIePV

--HG--
extra : rebase_source : facb880fd7cd4844355625d343d8504a6c2998bc
---
 browser/themes/windows/browser-aero.css | 13 ++++++-------
 browser/themes/windows/browser.css      |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index d8d7ac619cb2..f222804dd97c 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 %filter substitution
-%define toolbarShadowColor hsla(209,67%,12%,0.35)
 %define glassActiveBorderColor rgb(37, 44, 51)
 %define glassInactiveBorderColor rgb(102, 102, 102)
 
@@ -260,7 +259,7 @@
     /* Artificially draw window borders that are covered by lwtheme, see bug 591930.
      * Borders for win7 are below, win10 doesn't need them. */
     #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
-      border-top: 1px solid @toolbarShadowColor@;
+      border-top: 1px solid @glassShadowColor@;
     }
   }
 
@@ -290,13 +289,13 @@
     /* Vertical toolbar border */
     #main-window[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),
     #main-window[sizemode=normal] #navigator-toolbox:-moz-lwtheme {
-      border-left: 1px solid @toolbarShadowColor@;
-      border-right: 1px solid @toolbarShadowColor@;
+      border-left: 1px solid @glassShadowColor@;
+      border-right: 1px solid @glassShadowColor@;
       background-clip: padding-box;
     }
 
     #main-window[sizemode=normal] #navigator-toolbox:not(:-moz-lwtheme)::after {
-      box-shadow: 1px 0 0 @toolbarShadowColor@, -1px 0 0 @toolbarShadowColor@;
+      box-shadow: 1px 0 0 @glassShadowColor@, -1px 0 0 @glassShadowColor@;
       margin-left: 1px;
       margin-right: 1px;
     }
@@ -304,12 +303,12 @@
     #main-window[sizemode=normal] #browser-border-start,
     #main-window[sizemode=normal] #browser-border-end {
       display: -moz-box;
-      background-color: @toolbarShadowColor@;
+      background-color: @glassShadowColor@;
       width: 1px;
     }
 
     #main-window[sizemode=normal] #browser-bottombox {
-      border: 1px solid @toolbarShadowColor@;
+      border: 1px solid @glassShadowColor@;
       border-top-style: none;
       background-clip: padding-box;
     }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 0e3ad0383da7..388cdb395827 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -8,6 +8,8 @@
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 %include ../shared/browser.inc.css
+%filter substitution
+%define glassShadowColor hsla(209,67%,12%,0.35)
 
 :root {
   --titlebar-text-color: currentColor;
@@ -112,7 +114,7 @@
 @media (-moz-os-version: windows-win7) {
   @media (-moz-windows-default-theme) {
     :root:not(:-moz-lwtheme) {
-      --tabs-border: #4A4A4F;
+      --tabs-border: @glassShadowColor@;
     }
 
     #TabsToolbar:not(:-moz-lwtheme) {