Bug 398874 copy bug 184841 addressingwidget appearance r=Mano,mscott a=mconnor

toolkit/themes/gnomestripe/global/global.css

@@ -62,7 +62,7 @@ menulist > menupopup,
 }
 
 .menulist-compact {
-  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
 progressmeter[mode="undetermined"] {

toolkit/themes/gnomestripe/global/menulist.css

@@ -105,30 +105,41 @@ html|*.menulist-editable-input {
 /* ::::: compact menulists ::::: */
 
 .menulist-compact {
-  -moz-appearance: button;
+  -moz-appearance: none;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0;
-  color: -moz-DialogText;
-}
-
-.menulist-compact > .menulist-dropmarker {
-  -moz-appearance: none;
-  display: -moz-box;
-  -moz-margin-start: 2px;
-  padding: 0 !important;
+  -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
+  -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
+  background-color: ThreeDFace;
+  color: ButtonText;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
-.menulist-compact[disabled="true"] > .menulist-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
-}
-
-.menulist-compact > .menulist-label {
+.menulist-compact > .menulist-label-box > .menulist-label {
   margin: 0 3px !important;
   text-align: right;
 }  
 
-.menulist-compact[open="true"] {
-  color: ThreeDHighlight;
+.menulist-compact > .menulist-label-box > .menulist-icon {
+  -moz-margin-start: 2px;
+}
+
+.menulist-compact[open="true"] {
+  -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight;
+  -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
+}
+
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.menulist-compact:focus > .menulist-label-box {
+  border: 1px dotted;
+  background-color: transparent;
+  color: inherit;
 }

toolkit/themes/winstripe/global/global.css

@@ -58,7 +58,7 @@ menulist > menupopup,
 }
 
 .menulist-compact {
-  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
 progressmeter[mode="undetermined"] {

toolkit/themes/winstripe/global/globalBindings.xml

@@ -72,4 +72,16 @@
       </xul:stack>
     </content>
   </binding>
+
+  <binding id="menulist-compact" display="xul:menu" 
+           extends="chrome://global/content/bindings/menulist.xml#menulist">
+    <content sizetopopup="false">
+      <xul:hbox class="menulist-label-box" flex="1">
+        <xul:image class="menulist-icon" xbl:inherits="src"/>
+        <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+      </xul:hbox>
+      <children includes="menupopup"/>
+    </content>
+  </binding>
+
 </bindings>

toolkit/themes/winstripe/global/menulist.css

@@ -144,34 +144,41 @@ html|*.menulist-editable-input {
 /* ::::: compact menulists ::::: */
 
 .menulist-compact {
+  -moz-appearance: none;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0;
-  -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
+  -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
+  -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
+  background-color: ThreeDFace;
+  color: ButtonText;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
 }
 
-.menulist-compact > .menulist-label {
+.menulist-compact > .menulist-label-box > .menulist-label {
   margin: 0 3px !important;
   text-align: right;
 }  
 
-.menulist-compact > .menulist-dropmarker {
+.menulist-compact > .menulist-label-box > .menulist-icon {
   -moz-margin-start: 2px;
-  border: none;
-  padding: 0 !important;
-  background: transparent;
 }
 
 .menulist-compact[open="true"] {
   -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
+  -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight;
+  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight;
   -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
-  background-color: ThreeDShadow;
-  color: ThreeDHighlight;
+}
+
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
+}
+
+.menulist-compact:focus > .menulist-label-box {
+  border: 1px dotted;
+  background-color: transparent;
+  color: inherit;
 }