From 023bb2fd402a99795b17cba5c618f3bde61221d6 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Mon, 25 Mar 2013 21:28:13 +0100
Subject: [PATCH] Bug 853431 - Fix menulist active (hover) text color on
 Windows 7 and up. r=fryn ui-r=fryn

---
 toolkit/themes/windows/global/menu.css          | 17 ++++++++++-------
 toolkit/themes/windows/global/menulist-aero.css |  7 +++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css
index 09bf63a9d867..6d5b750c71ba 100644
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -165,11 +165,7 @@ menupopup > menuitem {
 }
 
 menu[_moz-menuactive="true"],
-.menulist-menupopup > menu[_moz-menuactive="true"],
-menulist > menupopup > menu[_moz-menuactive="true"],
 menuitem[_moz-menuactive="true"],
-.menulist-menupopup > menuitem[_moz-menuactive="true"],
-menulist > menupopup > menuitem[_moz-menuactive="true"],
 .splitmenu-menuitem[_moz-menuactive="true"] {
   background-color: -moz-menuhover;
   color: -moz-menuhovertext;
@@ -183,12 +179,21 @@ menulist > menupopup > menuitem,
 menulist > menupopup > menu {
   -moz-appearance: none;
   border: 1px solid transparent;
-  padding: 1px 5px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
   max-width: none;
   font: message-box;
   color: -moz-FieldText;
 }
 
+.menulist-menupopup > menuitem[_moz-menuactive="true"],
+menulist > menupopup > menuitem[_moz-menuactive="true"],
+.menulist-menupopup > menu[_moz-menuactive="true"],
+menulist > menupopup > menu[_moz-menuactive="true"] {
+  background-color: highlight;
+  color: highlighttext;
+}
+
 .menulist-menupopup > menuitem > .menu-iconic-left,
 menulist > menupopup > menuitem > .menu-iconic-left,
 .menulist-menupopup > menu > .menu-iconic-left,
@@ -207,8 +212,6 @@ menulist > menupopup > menu > label {
 
 menulist:-moz-focusring > menupopup > menuitem[_moz-menuactive="true"] {
   border: 1px dotted #F5DB95;
-  background-color: highlight;
-  color: highlighttext;
 }
 
 menulist > menupopup > menuitem[_moz-menuactive="true"][disabled="true"] {
diff --git a/toolkit/themes/windows/global/menulist-aero.css b/toolkit/themes/windows/global/menulist-aero.css
index 819917f7a82c..ad961128dc12 100644
--- a/toolkit/themes/windows/global/menulist-aero.css
+++ b/toolkit/themes/windows/global/menulist-aero.css
@@ -8,3 +8,10 @@
 menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box {
   border: 1px dotted ThreeDDarkShadow;
 }
+
+@media (-moz-windows-default-theme) {
+  .menulist-label-box {
+    background-color: transparent !important;
+    color: inherit !important;
+  }
+}