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.
authorstefanh@inbox.com
Mon, 03 Dec 2007 07:10:08 -0800
changeset 8589 154ae82adbf605620ece44cfe6d0e40c43be1d71
parent 8588 fbdb7cb8d321132757788909f19a22958dc11d68
child 8590 1c46faf1272bf22be4ecb6f45cd7aae4e2b3b62e
push idunknown
push userunknown
push dateunknown
reviewersbeltzner, Mano, mtschrep
bugs349437
milestone1.9b2pre
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.
browser/components/preferences/colors.xul
browser/components/preferences/fonts.xul
browser/components/preferences/languages.xul
browser/themes/pinstripe/browser/preferences/preferences.css
toolkit/themes/pinstripe/global/menu.css
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -34,16 +34,19 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** 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" >
 
 <prefwindow id="ColorsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&colorsDialog.title;"
             dlgbuttons="accept,cancel,help"
 #ifdef XP_MACOSX
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -37,16 +37,19 @@
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** 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" >
 
 <prefwindow id="FontsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&fontsDialog.title;"
             dlgbuttons="accept,cancel,help"
 #ifdef XP_UNIX
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -37,16 +37,19 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 <!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"
             title="&languages.customize.Header;"
             dlgbuttons="accept,cancel,help"
             style="width: &window.width;;">
 
   <prefpane id="LanguagesDialogPane" onpaneload="gLanguagesDialog.init();"
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -33,24 +33,35 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
+
+ menulist > menupopup > menuitem {
+   font: -moz-pull-down-menu;
+ }
+ 
 .prefWindow-dlgbuttons {
   margin: 0 12px 8px 12px;
 }
 
 #BrowserPreferences .prefWindow-dlgbuttons {
   padding-top: 0 !important;
 }
 
+#FontsDialog > .prefWindow-dlgbuttons,
+#ColorsDialog > .prefWindow-dlgbuttons,
+#LanguagesDialog > .prefWindow-dlgbuttons {
+  margin: 0;
+}
+
 .windowDialog {
   padding: 12px;
   font: -moz-dialog;
 }
 
 .paneSelector {
   list-style-image: url("chrome://browser/skin/preferences/Options.png");
   padding: 0 5px;
--- a/toolkit/themes/pinstripe/global/menu.css
+++ b/toolkit/themes/pinstripe/global/menu.css
@@ -168,17 +168,17 @@ popup > menuitem[_moz-menuactive="true"]
 /* ::::: menu/menuitems in menulist popups ::::: */
 
 .menulist-menupopup > menuitem,
 menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
   padding-right: 25px !important;
   max-width: none;
-  font: -moz-pull-down-menu;
+  font: inherit;
   color: -moz-FieldText;
 }
 
 .menulist-menupopup > menuitem > .menu-iconic-left,
 menulist > menupopup > menuitem > .menu-iconic-left,
 .menulist-menupopup > menu > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   margin: 0 2px 0 0 !important;