Bug 1176719 - Missed additions for Win10. r=bwinton, a=rkent
authorRichard Marti <richard.marti@gmail.com>
Sun, 21 Jun 2015 23:02:11 +0200
changeset 26175 8245f250a03fe9ff81bbd5a2ba01c56be42b3050
parent 26174 f9a9f3cfcdaa66193066fc2d218ea8774255f883
child 26176 690b3a6f116ca7c687b74c4139113e3ff3b038c3
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton, rkent
bugs1176719
Bug 1176719 - Missed additions for Win10. r=bwinton, a=rkent
mail/themes/windows/mail/mailWindow1-aero.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/themes/windows/mail/mailWindow1-aero.css
+++ b/mail/themes/windows/mail/mailWindow1-aero.css
@@ -355,35 +355,37 @@ treechildren::-moz-tree-image(junkStatus
   #folderTree {
     background-color: -moz-Dialog;
   }
 }
 
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win7),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
-  #messengerWindow[sizemode=normal] #tabpanelcontainer {
-    border: 1px solid rgba(10%, 10%, 10%, .4);
-    border-top: none;
-    background-clip: padding-box;
-  }
+  @media (-moz-windows-compositor) {
+    #messengerWindow[sizemode=normal] #tabpanelcontainer {
+      border: 1px solid rgba(10%, 10%, 10%, .4);
+      border-top: none;
+      background-clip: padding-box;
+    }
 
-  #messengerWindow[sizemode=normal] #mail-toolbar-menubar2 {
-    border-right: 1px solid rgba(10%, 10%, 10%, .4);
-    border-left: 1px solid rgba(10%, 10%, 10%, .4);
-    background-clip: padding-box;
-  }
+    #messengerWindow[sizemode=normal] #mail-toolbar-menubar2 {
+      border-right: 1px solid rgba(10%, 10%, 10%, .4);
+      border-left: 1px solid rgba(10%, 10%, 10%, .4);
+      background-clip: padding-box;
+    }
 
-  #messengerWindow[sizemode=normal] statusbar {
-    -moz-appearance: none;
-    margin-top: -1px;
-    border: 1px solid rgba(10%, 10%, 10%, .4);
-    border-top-color: threedshadow;
-    border-radius: 1px 1px 0 0;
-    background-clip: padding-box;
+    #messengerWindow[sizemode=normal] statusbar {
+      -moz-appearance: none;
+      margin-top: -1px;
+      border: 1px solid rgba(10%, 10%, 10%, .4);
+      border-top-color: threedshadow;
+      border-radius: 1px 1px 0 0;
+      background-clip: padding-box;
+    }
   }
 }
 
 @media (-moz-windows-glass) {
   /* lesser transparency on Glass background */
   #tabbar-toolbar menulist:not(:-moz-lwtheme):not([open="true"]) {
     background-color: rgba(227, 237, 246, .7);
   }
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -31,17 +31,18 @@
 @media not all and (-moz-windows-compositor) {
 %endif
   #mail-toolbar-menubar2:not([autohide="true"]) {
     -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
   }
 %ifdef WINDOWS_AERO
 }
 
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+       (-moz-os-version: windows-win10) {
   @media not all and (-moz-windows-default-theme) {
     #mail-toolbar-menubar2:not([autohide="true"]) {
       -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag");
     }
   }
 }
 %endif