From 20a505a89660e51df7f361869ebc661bb441e3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 15 Aug 2018 12:46:26 +0200
Subject: [PATCH] Bug 1483503 - Stop setting color: MenuText on menu, menuitem,
 and menucaption elements. r=stefanh

---
 toolkit/themes/linux/global/menu.css   | 1 -
 toolkit/themes/osx/global/menu.css     | 1 -
 toolkit/themes/osx/global/popup.css    | 1 +
 toolkit/themes/windows/global/menu.css | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/toolkit/themes/linux/global/menu.css b/toolkit/themes/linux/global/menu.css
index ec656a661dff..64ebe6ee57f9 100644
--- a/toolkit/themes/linux/global/menu.css
+++ b/toolkit/themes/linux/global/menu.css
@@ -21,7 +21,6 @@ menucaption {
   -moz-appearance: menuitem;
   -moz-box-align: center;
   max-width: 42em;
-  color: MenuText;
   list-style-image: none;
   -moz-image-region: auto;
 }
diff --git a/toolkit/themes/osx/global/menu.css b/toolkit/themes/osx/global/menu.css
index 61d2c177e0c7..501a54a31e1a 100644
--- a/toolkit/themes/osx/global/menu.css
+++ b/toolkit/themes/osx/global/menu.css
@@ -10,7 +10,6 @@ menucaption {
   -moz-appearance: menuitem;
   -moz-font-smoothing-background-color: -moz-mac-menuitem;
   -moz-box-align: center;
-  color: MenuText;
   list-style-image: none;
   -moz-image-region: auto;
   padding: 0 21px 2px;
diff --git a/toolkit/themes/osx/global/popup.css b/toolkit/themes/osx/global/popup.css
index c175c095b69d..10db3879301d 100644
--- a/toolkit/themes/osx/global/popup.css
+++ b/toolkit/themes/osx/global/popup.css
@@ -9,6 +9,7 @@ panel {
   -moz-appearance: menupopup;
   -moz-font-smoothing-background-color: -moz-mac-menupopup;
   background-color: Menu;
+  color: MenuText;
 }
 
 menupopup > menu > menupopup {
diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css
index cfe6f584c780..012c46685e39 100644
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -20,7 +20,6 @@ menuitem,
 menucaption {
   -moz-appearance: menuitem;
   -moz-box-align: center;
-  color: MenuText;
   list-style-image: none;
   -moz-image-region: auto;
 }