From a114ea0bcfda8fd021f951367f888730ba820a58 Mon Sep 17 00:00:00 2001
From: "stefanh%inbox.com"
 <stefanh%inbox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 3 Dec 2007 15:10:08 +0000
Subject: [PATCH] Bug 349437 - Menulist menuitem font doesn't inherit from the
 parent anymore: Make the font inherit and fix consumers in Firefox prefs.
 ui-r=beltzner, r=Mano, a=mtschrep.

git-svn-id: svn://10.0.0.236/trunk@240310 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/preferences/colors.xul     |  3 +++
 mozilla/browser/components/preferences/fonts.xul      |  3 +++
 mozilla/browser/components/preferences/languages.xul  |  3 +++
 .../pinstripe/browser/preferences/preferences.css     | 11 +++++++++++
 mozilla/toolkit/themes/pinstripe/global/menu.css      |  2 +-
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/components/preferences/colors.xul b/mozilla/browser/components/preferences/colors.xul
index 55801f2fd43..bb7f474e0e1 100644
--- a/mozilla/browser/components/preferences/colors.xul
+++ b/mozilla/browser/components/preferences/colors.xul
@@ -39,6 +39,9 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+#ifdef XP_MACOSX
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+#endif
 
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/colors.dtd" >
 
diff --git a/mozilla/browser/components/preferences/fonts.xul b/mozilla/browser/components/preferences/fonts.xul
index 80c8f3b16d1..8e408143fa4 100644
--- a/mozilla/browser/components/preferences/fonts.xul
+++ b/mozilla/browser/components/preferences/fonts.xul
@@ -42,6 +42,9 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+#ifdef XP_MACOSX
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+#endif
 
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/fonts.dtd" >
 
diff --git a/mozilla/browser/components/preferences/languages.xul b/mozilla/browser/components/preferences/languages.xul
index e4783c934dd..e3a039c370c 100644
--- a/mozilla/browser/components/preferences/languages.xul
+++ b/mozilla/browser/components/preferences/languages.xul
@@ -42,6 +42,9 @@
 <!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/languages.dtd">
 
 <?xml-stylesheet href="chrome://global/skin/"?>
+#ifdef XP_MACOSX
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+#endif
 
 <prefwindow id="LanguagesDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
index 4f521d8e1c7..36ad6d69a8d 100644
--- a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -38,6 +38,11 @@
 #
 # ***** END LICENSE BLOCK *****
 */
+
+ menulist > menupopup > menuitem {
+   font: -moz-pull-down-menu;
+ }
+ 
 .prefWindow-dlgbuttons {
   margin: 0 12px 8px 12px;
 }
@@ -46,6 +51,12 @@
   padding-top: 0 !important;
 }
 
+#FontsDialog > .prefWindow-dlgbuttons,
+#ColorsDialog > .prefWindow-dlgbuttons,
+#LanguagesDialog > .prefWindow-dlgbuttons {
+  margin: 0;
+}
+
 .windowDialog {
   padding: 12px;
   font: -moz-dialog;
diff --git a/mozilla/toolkit/themes/pinstripe/global/menu.css b/mozilla/toolkit/themes/pinstripe/global/menu.css
index 7632e22ba8f..0c1bed52516 100644
--- a/mozilla/toolkit/themes/pinstripe/global/menu.css
+++ b/mozilla/toolkit/themes/pinstripe/global/menu.css
@@ -173,7 +173,7 @@ menulist > menupopup > menuitem,
 menulist > menupopup > menu {
   padding-right: 25px !important;
   max-width: none;
-  font: -moz-pull-down-menu;
+  font: inherit;
   color: -moz-FieldText;
 }