Description: Use -moz-menubartext rather than MenuText on elements with menubar
 styling. Fixes a bug on themes where the menu and menubar backgrounds are
 different colours
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=723908
Bug-Ubuntu: https://launchpad.net/bugs/925907
Author: Chris Coulson <chris.coulson@canonical.com>
Forwarded: https://bugzilla.mozilla.org/attachment.cgi?id=594152

Index: mozilla/mail/themes/gnomestripe/mail/tabmail.css
===================================================================
--- mozilla.orig/mail/themes/gnomestripe/mail/tabmail.css	2012-02-03 11:31:43.315924688 +0000
+++ mozilla/mail/themes/gnomestripe/mail/tabmail.css	2012-02-03 11:40:38.287915183 +0000
@@ -89,7 +89,7 @@
 }
 
 .tabmail-tab:not(:-moz-lwtheme) {
-  color: MenuText;
+  color: -moz-menubartext;
 }
 
 .tabmail-tab:hover {
Index: mozilla/mail/themes/gnomestripe/mail/messenger.css
===================================================================
--- mozilla.orig/mail/themes/gnomestripe/mail/messenger.css	2012-02-03 13:00:45.015829772 +0000
+++ mozilla/mail/themes/gnomestripe/mail/messenger.css	2012-02-03 13:01:02.199829467 +0000
@@ -99,7 +99,7 @@
 }
 
 toolbar:not(.inline-toolbar) toolbarbutton:not(:-moz-lwtheme) {
-  color: MenuText;
+  color: -moz-menubartext;
 }
 
 toolbar:not(.inline-toolbar) toolbarbutton[disabled="true"]:not(:-moz-lwtheme) {
Index: mozilla/mail/themes/gnomestripe/mail/icons/dropmarker.svg
===================================================================
--- mozilla.orig/mail/themes/gnomestripe/mail/icons/dropmarker.svg	2012-02-03 02:42:05.000000000 +0000
+++ mozilla/mail/themes/gnomestripe/mail/icons/dropmarker.svg	2012-02-03 13:02:35.639827807 +0000
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg"
   width="8"
   height="8">
-  <polygon fill="MenuText" points="8,2 4,8 0,2"/>
+  <polygon fill="-moz-menubartext" points="8,2 4,8 0,2"/>
 </svg>