Bug 595201 - popup notification menuitem highlight is broken (black on blue) in winstripe and pinstripe themes. r=neil a=b

browser/themes/winstripe/browser/browser.css

@@ -178,15 +178,6 @@
   -moz-margin-start: .5em;
 }
 
-/* menupopup > menu[_moz-menuactive="true"] etc. from menu.css doesn't match these nodes */
-.split-menuitem-item[_moz-menuactive="true"]:not([disabled]),
-.split-menuitem-menu[_moz-menuactive="true"]:not([disabled]),
-:-moz-any(#appmenuPrimaryPane, #appmenuSecondaryPane) > menu[_moz-menuactive="true"]:not([disabled]),
-:-moz-any(#appmenuPrimaryPane, #appmenuSecondaryPane) > menuitem[_moz-menuactive="true"]:not([disabled]) {
-  background-color: -moz-menuhover;
-  color: -moz-menuhovertext;
-}
-
 .split-menuitem-menu {
   -moz-box-pack: end;
 }

toolkit/themes/faststripe/global/menu.css

@@ -168,10 +168,8 @@ popup > menuitem {
   max-width: 42em;
 }
 
-menupopup > menu[_moz-menuactive="true"],
-menupopup > menuitem[_moz-menuactive="true"],
-popup > menu[_moz-menuactive="true"],
-popup > menuitem[_moz-menuactive="true"] {
+menu[_moz-menuactive="true"],
+menuitem[_moz-menuactive="true"] {
   background-color: -moz-menuhover;
   color: -moz-menuhovertext;
 }

toolkit/themes/pinstripe/global/menu.css

@@ -165,8 +165,8 @@ menupopup > menuitem {
   max-width: 42em;
 }
 
-menupopup > menu[_moz-menuactive="true"],
-menupopup > menuitem[_moz-menuactive="true"] {
+menu[_moz-menuactive="true"],
+menuitem[_moz-menuactive="true"] {
   color: -moz-mac-menutextselect;
   background-color: Highlight;
 }

toolkit/themes/pmstripe/global/menu.css

@@ -182,10 +182,8 @@ popup > menuitem {
   padding-bottom: 2px;
 }
 
-menupopup > menu[_moz-menuactive="true"],
-menupopup > menuitem[_moz-menuactive="true"],
-popup > menu[_moz-menuactive="true"],
-popup > menuitem[_moz-menuactive="true"] {
+menu[_moz-menuactive="true"],
+menuitem[_moz-menuactive="true"] {
   background: -moz-MenuHover;
   color: -moz-MenuHoverText;
 }

toolkit/themes/winstripe/global/menu.css

@@ -193,8 +193,8 @@ menupopup > menuitem {
   max-width: 42em;
 }
 
-menupopup > menu[_moz-menuactive="true"],
-menupopup > menuitem[_moz-menuactive="true"] {
+menu[_moz-menuactive="true"],
+menuitem[_moz-menuactive="true"] {
   background-color: -moz-menuhover;
   color: -moz-menuhovertext;
 }