From 528d356c6da2bd7bbdf7f8cc5690bd3f377c6ba5 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Wed, 9 Jul 2014 19:53:52 +0200
Subject: [PATCH] Bug 1035541 - Convert Content pane dialogs to be in-content.
 r=MattN, mano

---
 browser/components/preferences/fonts.xul           | 10 +---------
 .../components/preferences/in-content/content.js   |  6 ++----
 .../en-US/chrome/browser/preferences/fonts.dtd     |  3 ---
 .../themes/shared/incontentprefs/preferences.css   | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/browser/components/preferences/fonts.xul b/browser/components/preferences/fonts.xul
index 4e837905f25c..f4ceeb2d6897 100644
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -17,15 +17,7 @@
             title="&fontsDialog.title;"
             dlgbuttons="accept,cancel,help"
             ondialoghelp="openPrefsHelp()"
-#ifdef XP_UNIX
-#ifdef XP_MACOSX
-            style="width: &window.macWidth; !important;">
-#else
-            style="width: &window.unixWidth; !important;">
-#endif
-#else
-            style="width: &window.width; !important;">
-#endif
+            style="">
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
diff --git a/browser/components/preferences/in-content/content.js b/browser/components/preferences/in-content/content.js
index 91a4d0d45eac..76c240ed6b91 100644
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -153,8 +153,7 @@ var gContentPane = {
    */  
   configureFonts: function ()
   {
-    openDialog("chrome://browser/content/preferences/fonts.xul", 
-               "Browser:FontPreferences", null);
+    gSubDialog.open("chrome://browser/content/preferences/fonts.xul");
   },
 
   /**
@@ -182,8 +181,7 @@ var gContentPane = {
    */
   showTranslationExceptions: function ()
   {
-    openDialog("chrome://browser/content/preferences/translation.xul",
-               "Browser:TranslationExceptions", null);
+    gSubDialog.open("chrome://browser/content/preferences/translation.xul");
   },
 
   openTranslationProviderAttribution: function ()
diff --git a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
index 534cb56ddd72..f243cba3d7c4 100644
--- a/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/fonts.dtd
@@ -3,9 +3,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY  fontsDialog.title                       "Fonts">
-<!ENTITY  window.width                            "39em">
-<!ENTITY  window.macWidth                         "43em">
-<!ENTITY  window.unixWidth                        "41em">
 
 <!ENTITY  language.label                          "Fonts for:">
 <!ENTITY  language.accesskey                      "F">
diff --git a/browser/themes/shared/incontentprefs/preferences.css b/browser/themes/shared/incontentprefs/preferences.css
index eee0f7486021..7eb7ad1d3bcf 100644
--- a/browser/themes/shared/incontentprefs/preferences.css
+++ b/browser/themes/shared/incontentprefs/preferences.css
@@ -126,6 +126,7 @@ tab[selected] {
 /* buttons and menulists */
 
 button,
+colorpicker[type="button"],
 menulist {
   -moz-appearance: none;
   height: 30px;
@@ -142,20 +143,28 @@ menulist {
 }
 
 button:not([disabled="true"]):hover,
+colorpicker[type="button"]:not([disabled="true"]):hover,
 menulist:not([disabled="true"]):hover {
   background-color: #EBEBEB;
 }
 
 button:not([disabled="true"]):hover:active,
+colorpicker[type="button"]:not([disabled="true"]):hover:active,
 menulist[open="true"]:not([disabled="true"]) {
   background-color: #DADADA;
 }
 
 button[disabled="true"],
+colorpicker[type="button"][disabled="true"],
 menulist[disabled="true"] {
   opacity: 0.5;
 }
 
+colorpicker[type="button"] {
+  padding: 6px;
+  width: 50px;
+}
+
 button > .button-box,
 menulist > .menulist-label-box {
   padding-right: 10px !important;
@@ -893,6 +902,11 @@ tree:not(#rejectsTree) {
   min-height: 15em;
 }
 
+:-moz-any(dialog, window, prefwindow) groupbox {
+  -moz-margin-start: 8px;
+  -moz-margin-end: 8px;
+}
+
 /**
  * End sub-dialog
  */