From a23c56e3afc59111ec1b971285206ead2113e086 Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com" <hewitt%netscape.com>
Date: Tue, 10 Oct 2000 04:40:56 +0000
Subject: [PATCH] #52544 - fixed color picker in mailnews prefs, r=andreww,
 sr=hangas

---
 themes/classic/global/mac/colorpicker.css     | 16 +++-------------
 themes/classic/global/win/colorpicker.css     | 16 +++-------------
 themes/modern/global/colorpicker.css          | 16 +++-------------
 xpfe/global/resources/content/xulBindings.xml |  4 ++--
 4 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/themes/classic/global/mac/colorpicker.css b/themes/classic/global/mac/colorpicker.css
index 815ca8aaeeeb..504420dd793f 100644
--- a/themes/classic/global/mac/colorpicker.css
+++ b/themes/classic/global/mac/colorpicker.css
@@ -1,18 +1,12 @@
 
 colorpicker[type="button"] {
-  max-width: 35px;
-  max-height: 20px;
-  min-width: 35px;
-  min-height: 20px;
+  width: 35px;
+  height: 20px;
   border: 1px solid #000000;
 }
 
 .colorpicker-button-menu {
-  max-width: 33px;
-  max-height: 18px;
-  min-width: 33px;
-  min-height: 18px;
-  padding: 2px;
+  padding: 3px;
   border: 1px solid transparent;
 }
 
@@ -21,9 +15,5 @@ colorpicker[type="button"] {
 }
 
 .colorpicker-button-colorbox {
-  max-width: 27px;
-  max-height: 12px;
-  min-width: 27px;
-  min-height: 12px;
   border: 1px solid #000000;
 }
diff --git a/themes/classic/global/win/colorpicker.css b/themes/classic/global/win/colorpicker.css
index c782fff88a98..957933066e93 100644
--- a/themes/classic/global/win/colorpicker.css
+++ b/themes/classic/global/win/colorpicker.css
@@ -1,8 +1,6 @@
 colorpicker[type="button"] {
-  max-width: 35px;
-  max-height: 20px;
-  min-width: 35px;
-  min-height: 20px;
+  width: 35px;
+  height: 20px;
   border-left: 1px solid threedhighlight;
   border-top: 1px solid threedhighlight;
   border-right: 1px solid threeddarkshadow;
@@ -17,15 +15,11 @@ colorpicker[type="button"][menuactive="true"] {
 }
 
 .colorpicker-button-menu {
-  max-width: 33px;
-  max-height: 18px;
-  min-width: 33px;
-  min-height: 18px;
   border-left: 1px solid transparent;
   border-top: 1px solid transparent;
   border-right: 1px solid threedshadow;
   border-bottom: 1px solid threedshadow;
-  padding: 1px;
+  padding: 3px;
 }
 
 .colorpicker-button-menu[open="true"]
@@ -37,9 +31,5 @@ colorpicker[type="button"][menuactive="true"] {
 }
 
 .colorpicker-button-colorbox {
-  max-width: 28px;
-  max-height: 13px;
-  min-width: 28px;
-  min-height: 13px;
   border: 1px solid #000000;
 }
diff --git a/themes/modern/global/colorpicker.css b/themes/modern/global/colorpicker.css
index 004858a5bdcb..8b3c5e8d9ece 100644
--- a/themes/modern/global/colorpicker.css
+++ b/themes/modern/global/colorpicker.css
@@ -1,9 +1,7 @@
 
 colorpicker[type="button"] {
-  max-width: 35px;
-  max-height: 20px;
-  min-width: 35px;
-  min-height: 20px;
+  width: 35px;
+  height: 20px;
   border: 1px outset #CCCCCC;
 }
 
@@ -12,18 +10,10 @@ colorpicker[type="button"][menuactive="true"] {
 }
 
 .colorpicker-button-menu {
-  max-width: 35px;
-  max-height: 20px;
-  min-width: 35px;
-  min-height: 20px;
-  padding: 2px;
+  padding: 3px;
 }
 
 .colorpicker-button-colorbox {
-  max-width: 28px;
-  max-height: 13px;
-  min-width: 28px;
-  min-height: 13px;
   border: 1px solid #000000;
 }
 
diff --git a/xpfe/global/resources/content/xulBindings.xml b/xpfe/global/resources/content/xulBindings.xml
index d2d4fc9ff2ca..721c1383d3b7 100644
--- a/xpfe/global/resources/content/xulBindings.xml
+++ b/xpfe/global/resources/content/xulBindings.xml
@@ -560,8 +560,8 @@
  <!-- NOTE: this should really extend menu, but doing this causes the menupopup to be ignored (bug) -->
   <binding id="colorpickerButton" extends="xul:box">
     <content>
-      <xul:menu class="colorpicker-button-menu" allowevents="true">
-        <xul:box class="colorpicker-button-colorbox"/>
+      <xul:menu class="colorpicker-button-menu" allowevents="true" flex="1">
+        <xul:box class="colorpicker-button-colorbox" flex="1"/>
         <xul:menupopup class="colorpicker-button-menupopup"
           oncreate="this.parentNode.parentNode.setAttribute('menuactive', 'true')"
           ondestroy="this.parentNode.parentNode.setAttribute('menuactive', 'false')">