Bug 1165718 - Use system text styling for menu in Win7 classic Dev Edition theme;r=Gijs

--HG--
extra : commitid : 7qRFoxZp3GX

browser/themes/windows/browser.css

@@ -121,6 +121,9 @@
 
 @media not all and (-moz-windows-compositor),
        not all and (-moz-windows-default-theme) {
+  /* Please keep the menu text colors in this media block in sync with
+   * devedition.css, minus the :not(:-moz-lwtheme) condition - see Bug 1165718.
+   */
   #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme),
   #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) {
     color: CaptionText;

browser/themes/windows/devedition.css

@@ -158,6 +158,24 @@
   color: inherit;
 }
 
+/* Use proper menu text styling in Win7 classic mode (copied from browser.css) */
+@media not all and (-moz-windows-compositor),
+       not all and (-moz-windows-default-theme) {
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar {
+    color: CaptionText;
+  }
+
+  #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:-moz-window-inactive,
+  #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:-moz-window-inactive {
+    color: InactiveCaptionText;
+  }
+
+  #main-window[tabsintitlebar] #main-menubar > menu {
+    color: inherit;
+  }
+}
+
 /* Use less opacity than normal since this is very dark, and on top of the default toolbar color */
 .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
 .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {