From d11b213dd7af10200cc74198cb974bb93bbdfd1f Mon Sep 17 00:00:00 2001 From: "sdwilsh@shawnwilsher.com" Date: Mon, 22 Oct 2007 11:07:01 -0700 Subject: [PATCH] Bug 394881 - [Mac] Prefpanes should specify heights. r=mconnor --- browser/app/profile/firefox.js | 4 ---- browser/components/preferences/preferences.xul | 2 +- .../locales/en-US/chrome/browser/preferences/preferences.dtd | 2 +- toolkit/content/widgets/preferences.xml | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ea85dbe46fe7..b4fdaad23fca 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -443,11 +443,7 @@ pref("browser.preferences.instantApply", false); #else pref("browser.preferences.instantApply", true); #endif -#ifdef XP_MACOSX -pref("browser.preferences.animateFadeIn", true); -#else pref("browser.preferences.animateFadeIn", false); -#endif pref("browser.download.show_plugins_in_list", true); pref("browser.download.hide_plugins_without_extensions", true); diff --git a/browser/components/preferences/preferences.xul b/browser/components/preferences/preferences.xul index 2f5675e1a513..a2a672a3cfd9 100644 --- a/browser/components/preferences/preferences.xul +++ b/browser/components/preferences/preferences.xul @@ -85,7 +85,7 @@ style="&prefWin.styleWin;"> #else #ifdef XP_MACOSX - style="&prefWindow.styleMac;"> + style="&prefWin.styleMac;"> #else style="&prefWin.styleGNOME;"> #endif diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd index dfde7f1a5642..02235a868995 100644 --- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd @@ -4,7 +4,7 @@ - + diff --git a/toolkit/content/widgets/preferences.xml b/toolkit/content/widgets/preferences.xml index 328792f1e4a9..ffde79cf96a0 100644 --- a/toolkit/content/widgets/preferences.xml +++ b/toolkit/content/widgets/preferences.xml @@ -801,11 +801,7 @@