From 0d3f625f7e18bdcd85c2cdaebc1f5034616e847d Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com"
 <cmanske%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 2 Feb 2001 00:14:32 +0000
Subject: [PATCH] Fixed color picker button (b=66417) and align menulist in
 image properties dialog (b=66354). r=blake, sr=sfraser

git-svn-id: svn://10.0.0.236/trunk@86007 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/themes/blue/editor/EditorDialog.css   |  12 ++++++-----
 .../themes/classic/editor/EditorDialog.css    |  15 ++++++++++----
 .../editor/images/img-align-bottom.gif        | Bin 199 -> 192 bytes
 .../editor/images/img-align-middle.gif        | Bin 185 -> 184 bytes
 .../classic/editor/images/img-align-top.gif   | Bin 185 -> 186 bytes
 .../classic/editor/mac/EditorDialog.css       |  15 ++++++++++----
 .../classic/editor/win/EditorDialog.css       |  15 ++++++++++----
 mozilla/themes/modern/editor/EditorDialog.css |  19 ++++++++++++------
 .../modern/editor/images/img-align-bottom.gif | Bin 199 -> 192 bytes
 .../modern/editor/images/img-align-middle.gif | Bin 185 -> 184 bytes
 .../modern/editor/images/img-align-top.gif    | Bin 185 -> 186 bytes
 11 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/mozilla/themes/blue/editor/EditorDialog.css b/mozilla/themes/blue/editor/EditorDialog.css
index 5841d4b687e..36952909977 100644
--- a/mozilla/themes/blue/editor/EditorDialog.css
+++ b/mozilla/themes/blue/editor/EditorDialog.css
@@ -87,10 +87,10 @@ titledbox {
 }
 
 .color-well {
-  width:20px;
-  height: 16px; 
-  border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  width: 20px;
+  height: 12px; 
+  border: 1px inset #B4C3D4;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -100,7 +100,9 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 44px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/EditorDialog.css b/mozilla/themes/classic/editor/EditorDialog.css
index 57b0e1f607c..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/EditorDialog.css
+++ b/mozilla/themes/classic/editor/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 44px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/images/img-align-bottom.gif b/mozilla/themes/classic/editor/images/img-align-bottom.gif
index 32695115966c049da3c23a2cd6bb864fefa18715..a8ba1579703cd0936e27df8c75f7d2969c6d2161 100644
GIT binary patch
delta 160
zcmV;R0AK&d0l)zaM@dFFIbk3G8UUgKkqjz-00V_6y4?OS%1NueFzC%WRzV?-q!@fc
zI1X%iermza<cq~~JK7hX*Ql6Gw+og^fCA4VL?)M&5MeqM0j^5LVX@r`x`%M8K&@V}
zwyt)~9hV7KG{gI4*WKljyv_E~rFnW;Ykq_bO-F-teqv!_h)0kl2PG*Tmzb9a9ViY9
OVx6F&qNAh@2>?6jlSAA9

delta 167
zcmV;Y09gOP0mlIhM@dFFIbk3G8UUjIkqjz-Km&v*y4?OOlsRghGr%n*`5y)Vg|--{
zf~s8Wc0nx9^4myQUW}z3(ZC?k0Q4C<Ig8F@#8ECerq2T+>_#NhN`P8*4Pc~h%<Qtb
z=;J1=Zo6O3F-B^0TA&%V{T|iJMLkDUAQM=DO$Aj}S6L}uXDovufKpqJX<~nQm|kHL
VU~F$Gp`)Y;06RNssH<=Z06X4oMK%Bc

diff --git a/mozilla/themes/classic/editor/images/img-align-middle.gif b/mozilla/themes/classic/editor/images/img-align-middle.gif
index 911ba464a18922092003b7bf3ce3930e725fa379..4189f7ac335a6f9863637c77b2d058f74e49e854 100644
GIT binary patch
delta 152
zcmV;J0B8TX0k{DSM@dFFIbk3G8UUgMkqjz-00VtUy4?OS%1Nue@aWAsR>vTYq<DNp
zI0kHarpx)tTe`CC_`);D$Tu8m2lEw+ssS!%`o)a9q>|b6^?1Kh2{5=KHL03(%N=XS
zHi23#0=T=Kcs#up4BT&G1MCRZ?RR-7esv>)AB1ZpWrJF0jgCWua&st_mzbHFo16^;
G2>?4Xh(p}~

delta 153
zcmV;K0A~NV0l5JTM@dFFIbk3G8UUjIkqjz-Km&eAy4?P(j2UX3v&5xI_lhKpBL)D&
z2d!+o7H}-ft|MXiaHezLd%j<7NPOHV7hLC~Sps1moF&HuS(}josdU<@8c<tqoGO~n
z=(L(crk;<MWQKDMZQya`#$FG#Cn!#QF;7ieTYz3IUr}2EiGgp2Bsh^~M}LfKo1C2l
HLkR#oY4bo^

diff --git a/mozilla/themes/classic/editor/images/img-align-top.gif b/mozilla/themes/classic/editor/images/img-align-top.gif
index 251e1862e9d7c3ddd490e4f93cc7851ee4f8f93f..d871945929d520d42d30d024750dfb7bc4db4173 100644
GIT binary patch
delta 154
zcmV;L0A>HV0lEPUM@dFFIbk3G8UUgMkqjz-00VzWy4?OS%1Nue@aWCE{~K`(WNDJ)
zsh*-4yyv0FvsiO2`R*od(?EtSHQ2#QK3h$xBpL%f;UdT+7LUkj^Cn!C00U}MBMMnh
z0C4iLZVBFRQd%7$J4W#MoQ`ql<!NDkesEuW7<hkQf_-NzZ4{0wkP{#tgP56`o1C2m
Io(>5BJJmoy<NyEw

delta 153
zcmV;K0A~NX0l5JTM@dFFIbk3G8UUjIkqjz-Km&eAy4?P(j2UX3v&5xI@7^GcBL)Bi
z2(4_p7H}-jbRCCSKAh>Ra<-XkNNh<k79B|QQK*=?WUlFS!aO$#sdVD~hDV*UNG_Yt
z=$BYb^|;+K+`w|dJUP{Tm>!tosZ0@TCOs@)T3Zucg=B~%ie6@pC4^rtVS|imo1C2l
HX$b&3tA|2p

diff --git a/mozilla/themes/classic/editor/mac/EditorDialog.css b/mozilla/themes/classic/editor/mac/EditorDialog.css
index 452483a215e..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/mac/EditorDialog.css
+++ b/mozilla/themes/classic/editor/mac/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 37px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/classic/editor/win/EditorDialog.css b/mozilla/themes/classic/editor/win/EditorDialog.css
index 5d293d00a27..25cdf8d8c77 100644
--- a/mozilla/themes/classic/editor/win/EditorDialog.css
+++ b/mozilla/themes/classic/editor/win/EditorDialog.css
@@ -85,11 +85,12 @@ titledbox {
   margin-top    : 6px;
   margin-bottom : 6px;
 }
+
 .color-well {
-  width:20px;
-  height: 16px; 
+  width: 20px;
+  height: 12px; 
   border: 1px inset #CCCCCC;
-  margin: 4px 2px 5px 8px;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
@@ -99,7 +100,13 @@ titledbox {
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 34px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[focused="true"] {
+  color: white;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/modern/editor/EditorDialog.css b/mozilla/themes/modern/editor/EditorDialog.css
index f5a6c113088..fd98d0ce806 100644
--- a/mozilla/themes/modern/editor/EditorDialog.css
+++ b/mozilla/themes/modern/editor/EditorDialog.css
@@ -87,20 +87,27 @@ titledbox {
 }
 
 .color-well {
-  width:20px;
-  height: 13px; 
-  border: 1px inset #B4C3D4;
-  margin: 4px 2px 4px 8px;
+  width: 20px;
+  height: 12px; 
+/*  border: 1px inset #B4C3D4; */
+  border: blue;
+  margin: 4px; 10px 4px 10px;
 }
 
 .color-well[default="true"] {
-  border: 1px solid transparent;
+  border: 1px solid blue;
   background-color: inherit;
 }
 
 button.color-button {
   /* need to override large default min-width */
-  min-width : 37px;
+  min-width : 32px;
+  width : 32px;
+  margin: 4px;
+}
+
+.menu-list[selected="true"] {
+  color: black;
 }
 
 #ColorPickerSwatch {
diff --git a/mozilla/themes/modern/editor/images/img-align-bottom.gif b/mozilla/themes/modern/editor/images/img-align-bottom.gif
index 32695115966c049da3c23a2cd6bb864fefa18715..a8ba1579703cd0936e27df8c75f7d2969c6d2161 100644
GIT binary patch
delta 160
zcmV;R0AK&d0l)zaM@dFFIbk3G8UUgKkqjz-00V_6y4?OS%1NueFzC%WRzV?-q!@fc
zI1X%iermza<cq~~JK7hX*Ql6Gw+og^fCA4VL?)M&5MeqM0j^5LVX@r`x`%M8K&@V}
zwyt)~9hV7KG{gI4*WKljyv_E~rFnW;Ykq_bO-F-teqv!_h)0kl2PG*Tmzb9a9ViY9
OVx6F&qNAh@2>?6jlSAA9

delta 167
zcmV;Y09gOP0mlIhM@dFFIbk3G8UUjIkqjz-Km&v*y4?OOlsRghGr%n*`5y)Vg|--{
zf~s8Wc0nx9^4myQUW}z3(ZC?k0Q4C<Ig8F@#8ECerq2T+>_#NhN`P8*4Pc~h%<Qtb
z=;J1=Zo6O3F-B^0TA&%V{T|iJMLkDUAQM=DO$Aj}S6L}uXDovufKpqJX<~nQm|kHL
VU~F$Gp`)Y;06RNssH<=Z06X4oMK%Bc

diff --git a/mozilla/themes/modern/editor/images/img-align-middle.gif b/mozilla/themes/modern/editor/images/img-align-middle.gif
index 911ba464a18922092003b7bf3ce3930e725fa379..4189f7ac335a6f9863637c77b2d058f74e49e854 100644
GIT binary patch
delta 152
zcmV;J0B8TX0k{DSM@dFFIbk3G8UUgMkqjz-00VtUy4?OS%1Nue@aWAsR>vTYq<DNp
zI0kHarpx)tTe`CC_`);D$Tu8m2lEw+ssS!%`o)a9q>|b6^?1Kh2{5=KHL03(%N=XS
zHi23#0=T=Kcs#up4BT&G1MCRZ?RR-7esv>)AB1ZpWrJF0jgCWua&st_mzbHFo16^;
G2>?4Xh(p}~

delta 153
zcmV;K0A~NV0l5JTM@dFFIbk3G8UUjIkqjz-Km&eAy4?P(j2UX3v&5xI_lhKpBL)D&
z2d!+o7H}-ft|MXiaHezLd%j<7NPOHV7hLC~Sps1moF&HuS(}josdU<@8c<tqoGO~n
z=(L(crk;<MWQKDMZQya`#$FG#Cn!#QF;7ieTYz3IUr}2EiGgp2Bsh^~M}LfKo1C2l
HLkR#oY4bo^

diff --git a/mozilla/themes/modern/editor/images/img-align-top.gif b/mozilla/themes/modern/editor/images/img-align-top.gif
index 251e1862e9d7c3ddd490e4f93cc7851ee4f8f93f..d871945929d520d42d30d024750dfb7bc4db4173 100644
GIT binary patch
delta 154
zcmV;L0A>HV0lEPUM@dFFIbk3G8UUgMkqjz-00VzWy4?OS%1Nue@aWCE{~K`(WNDJ)
zsh*-4yyv0FvsiO2`R*od(?EtSHQ2#QK3h$xBpL%f;UdT+7LUkj^Cn!C00U}MBMMnh
z0C4iLZVBFRQd%7$J4W#MoQ`ql<!NDkesEuW7<hkQf_-NzZ4{0wkP{#tgP56`o1C2m
Io(>5BJJmoy<NyEw

delta 153
zcmV;K0A~NX0l5JTM@dFFIbk3G8UUjIkqjz-Km&eAy4?P(j2UX3v&5xI@7^GcBL)Bi
z2(4_p7H}-jbRCCSKAh>Ra<-XkNNh<k79B|QQK*=?WUlFS!aO$#sdVD~hDV*UNG_Yt
z=$BYb^|;+K+`w|dJUP{Tm>!tosZ0@TCOs@)T3Zucg=B~%ie6@pC4^rtVS|imo1C2l
HX$b&3tA|2p