Bug 1514603 - Improve menubar visibility on Windows with a dark theme; r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sun, 16 Dec 2018 19:34:53 +0100
changeset 33157 c550aac13814
parent 33156 33c3ec8edd93
child 33158 9c7743f35239
push id2368
push userclokep@gmail.com
push dateMon, 28 Jan 2019 21:12:50 +0000
treeherdercomm-beta@56d23c07d815 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1514603
Bug 1514603 - Improve menubar visibility on Windows with a dark theme; r=jorgk
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/compose/messengercompose.css
mail/themes/windows/mail/primaryToolbar.css
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -85,16 +85,37 @@ toolbar:not(:-moz-lwtheme) {
   text-shadow: none;
 }
 
 toolbox > toolbar:last-of-type {
   padding-top: 1px;
   padding-bottom: 1px;
 }
 
+@media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu {
+    -moz-appearance: none;
+    border-style: none;
+  }
+
+  #menubar-items > #mail-menubar > menu[disabled="true"] {
+    background-color: transparent;
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"] {
+    background-color: hsla(0, 0%, 0%, .12);
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"]:-moz-lwtheme-brighttext {
+    background-color: hsla(0, 0%, 100%, .2);
+  }
+}
+
 /* ::::: Search Textbox ::::: */
 
 #peopleSearchInput {
   width: 20em;
   padding-top: 3px;
   padding-bottom: 3px;
   padding-inline-start: 5px;
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -38,16 +38,37 @@
 }
 
 #attachmentBucket .attachmentItem[dropOn="bottom"] {
   border-bottom-color: Highlight;
 }
 
 /* ::::: special toolbar colors ::::: */
 
+@media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
+  #menubar-items > #mail-menubar > menu {
+    -moz-appearance: none;
+    border-style: none;
+  }
+
+  #menubar-items > #mail-menubar > menu[disabled="true"] {
+    background-color: transparent;
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"] {
+    background-color: hsla(0, 0%, 0%, .12);
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"]:-moz-lwtheme-brighttext {
+    background-color: hsla(0, 0%, 100%, .2);
+  }
+}
+
 #composeContentBox {
   -moz-appearance: none;
   color: -moz-dialogtext;
   background-color: -moz-Dialog;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4) inset;
   border-top-width: 0;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1) inset;
 }
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -38,23 +38,28 @@
 }
 
 @media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #menubar-items > #mail-menubar > menu {
     -moz-appearance: none;
     border-style: none;
   }
 
-  #menubar-items > #mail-menubar > menu[_moz-menuactive="true"] {
+  #menubar-items > #mail-menubar > menu[disabled="true"] {
+    background-color: transparent;
+  }
+
+  #menubar-items > #mail-menubar >
+    menu:not([disabled="true"])[_moz-menuactive="true"] {
     background-color: hsla(0, 0%, 0%, .12);
   }
 
   #menubar-items > #mail-menubar >
-    menu:-moz-lwtheme-brighttext[_moz-menuactive="true"] {
-    background-color: hsla(0, 0%, 100%, .12);
+    menu:not([disabled="true"])[_moz-menuactive="true"]:-moz-lwtheme-brighttext {
+    background-color: hsla(0, 0%, 100%, .2);
   }
 }
 
 /**
  * In the classic themes, the titlebar has a horizontal gradient, which is
  * problematic for reading the text of background tabs when they're in the
  * titlebar. We side-step this issue by layering our own background underneath
  * the tabs. Unfortunately, this requires a bunch of positioning in order to