From c9433a88564f1083055127cd1be906f271dcc2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 15 Sep 2010 09:26:02 +0200
Subject: [PATCH] Bug 419298 - Dialog icons should be displayed in the native
 OS theme size without scaling. r=neil

---
 .../prompts/content/commonDialog.xul           |  2 +-
 .../themes/gnomestripe/global/commonDialog.css | 18 ++++++++++++++++++
 toolkit/themes/gnomestripe/global/global.css   |  9 ---------
 toolkit/themes/gnomestripe/global/jar.mn       |  1 +
 4 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 toolkit/themes/gnomestripe/global/commonDialog.css

diff --git a/toolkit/components/prompts/content/commonDialog.xul b/toolkit/components/prompts/content/commonDialog.xul
index f81b0111e4f..f6e4cedcc53 100644
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -51,7 +51,7 @@
 
     <rows>
       <row>
-        <hbox align="start">
+        <hbox id="iconContainer" align="start">
           <image id="info.icon" class="spaced"/>
         </hbox>
         <vbox id="infoContainer">
diff --git a/toolkit/themes/gnomestripe/global/commonDialog.css b/toolkit/themes/gnomestripe/global/commonDialog.css
new file mode 100644
index 00000000000..001d5e54f2d
--- /dev/null
+++ b/toolkit/themes/gnomestripe/global/commonDialog.css
@@ -0,0 +1,18 @@
+#filler {
+  -moz-margin-start: -8px;
+  -moz-margin-end: -10px;
+}
+
+#iconContainer {
+  -moz-box-pack: center;
+  min-height: 55px; /* maximum icon height + icon margin */
+  min-width: 58px; /* maximum icon width + icon margin */
+}
+
+#info\.icon {
+  max-width: 48px;
+  max-height: 48px;
+  /* The 'spaced' class does this already. It's repeated here to make it clearer
+     what margin values the #iconContainer's min-height and max-height depend on: */
+  margin: 3px 5px 4px;
+}
diff --git a/toolkit/themes/gnomestripe/global/global.css b/toolkit/themes/gnomestripe/global/global.css
index dc621b346b0..a9954be67be 100644
--- a/toolkit/themes/gnomestripe/global/global.css
+++ b/toolkit/themes/gnomestripe/global/global.css
@@ -94,15 +94,6 @@ window.dialog {
 
 /* ::::: alert icons :::::*/
 
-.message-icon,
-.alert-icon,
-.error-icon,
-.question-icon,
-.authentication-icon {
-  width: 40px;
-  height: 40px;
-}
-
 .message-icon {
   list-style-image: url("moz-icon://stock/gtk-dialog-info?size=dialog");
 }
diff --git a/toolkit/themes/gnomestripe/global/jar.mn b/toolkit/themes/gnomestripe/global/jar.mn
index eff524eb4a5..d2aba6837d7 100644
--- a/toolkit/themes/gnomestripe/global/jar.mn
+++ b/toolkit/themes/gnomestripe/global/jar.mn
@@ -2,6 +2,7 @@ toolkit.jar:
 +  skin/classic/global/autocomplete.css
 +  skin/classic/global/button.css
 +  skin/classic/global/checkbox.css
++  skin/classic/global/commonDialog.css
 +  skin/classic/global/dropmarker.css
 +  skin/classic/global/filefield.css
 +  skin/classic/global/filepicker.css