Bug 482585. Move some XUL textbox-specific rules out of xul.css and into the relevant bindings. r=enn, sr=dbaron

toolkit/content/jar.mn

@@ -8,6 +8,8 @@ toolkit.jar:
 *  content/global/license.html                (license.html)
    content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
 *  content/global/xul.css                     (xul.css)
+   content/global/textbox.css                 (textbox.css)
+   content/global/menulist.css                (menulist.css)
 *  content/global/about.xhtml                 (about.xhtml)
    content/global/directionDetector.html
    content/global/plugins.html

toolkit/content/menulist.css

@@ -0,0 +1,6 @@
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+html|*.menulist-editable-input {
+  -moz-appearance: none !important;
+  background: transparent ! important;
+}

toolkit/content/textbox.css

@@ -0,0 +1,31 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+html|*.textbox-input {
+  -moz-appearance: none !important;
+  text-align: inherit;
+  text-shadow: inherit;
+}
+
+html|*.textbox-textarea {
+  -moz-appearance: none !important;
+  text-shadow: inherit;
+}
+
+textbox[empty="true"] html|*.textbox-input ,
+textbox[empty="true"] html|*.textbox-textarea {
+  text-align: left;
+  direction: ltr;
+}
+
+textbox[empty="true"][chromedir="rtl"] html|*.textbox-input ,
+textbox[empty="true"][chromedir="rtl"] html|*.textbox-textarea {
+  text-align: right;
+  direction: rtl;
+}
+
+textbox[empty="true"] html|*.textbox-input[emptytextdelay="true"] ,
+textbox[empty="true"] html|*.textbox-textarea[emptytextdelay="true"] {
+  color: transparent !important;
+}
+

toolkit/content/widgets/datetimepicker.xml

@@ -53,6 +53,7 @@
            extends="chrome://global/content/bindings/general.xml#basecontrol">
 
     <resources>
+      <stylesheet src="chrome://global/content/textbox.css"/>
       <stylesheet src="chrome://global/skin/textbox.css"/>
       <stylesheet src="chrome://global/skin/dropmarker.css"/>
       <stylesheet src="chrome://global/skin/datetimepicker.css"/>

toolkit/content/widgets/menulist.xml

@@ -8,6 +8,7 @@
 
   <binding id="menulist-base" extends="chrome://global/content/bindings/general.xml#basecontrol">
     <resources>
+      <stylesheet src="chrome://global/content/menulist.css"/>
       <stylesheet src="chrome://global/skin/menulist.css"/>
     </resources>
   </binding>

toolkit/content/widgets/textbox.xml

@@ -15,6 +15,7 @@
 
   <binding id="textbox" extends="xul:box">
     <resources>
+      <stylesheet src="chrome://global/content/textbox.css"/>
       <stylesheet src="chrome://global/skin/textbox.css"/>
     </resources>
 

toolkit/content/xul.css

@@ -663,34 +663,6 @@ textbox[multiline="true"] {
   -moz-binding: url("chrome://global/content/bindings/textbox.xml#textarea");
 }
 
-html|*.textbox-input {
-  -moz-appearance: none !important;
-  text-align: inherit;
-  text-shadow: inherit;
-}
-
-html|*.textbox-textarea {
-  -moz-appearance: none !important;
-  text-shadow: inherit;
-}
-
-textbox[empty="true"] html|*.textbox-input ,
-textbox[empty="true"] html|*.textbox-textarea {
-  text-align: left;
-  direction: ltr;
-}
-
-textbox[empty="true"][chromedir="rtl"] html|*.textbox-input ,
-textbox[empty="true"][chromedir="rtl"] html|*.textbox-textarea {
-  text-align: right;
-  direction: rtl;
-}
-
-textbox[empty="true"] html|*.textbox-input[emptytextdelay="true"] ,
-textbox[empty="true"] html|*.textbox-textarea[emptytextdelay="true"] {
-  color: transparent !important;
-}
-
 .textbox-input-box {
   -moz-binding: url("chrome://global/content/bindings/textbox.xml#input-box");
 }
@@ -849,11 +821,6 @@ menulist[type="description"] {
   -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-description");
 }
 
-html|*.menulist-editable-input {
-  -moz-appearance: none !important;
-  background: transparent ! important;
-}
-
 menulist > menupopup > menuitem {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
 }