Bug 1473927 - Load "textbox.css" as a document stylesheet. r=bgrins draft
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Fri, 06 Jul 2018 17:13:56 +0100
changeset 826840 b28bcabd8ab4cfef31c456b869f048f8cc4157bf
parent 826839 a8169947aff7788ec0e54e0dd216b254052d8d0c
child 826841 40459f6a9ba48b76792dab717883e5aa66178ef0
push id118389
push userpaolo.mozmail@amadzone.org
push dateSun, 05 Aug 2018 13:37:46 +0000
reviewersbgrins
bugs1473927
milestone63.0a1
Bug 1473927 - Load "textbox.css" as a document stylesheet. r=bgrins MozReview-Commit-ID: 4dPm8tfHGic
browser/components/syncedtabs/sidebar.xhtml
toolkit/content/widgets.css
toolkit/content/widgets/datetimebox.xml
toolkit/content/widgets/textbox.xml
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -17,17 +17,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <script src="chrome://browser/content/syncedtabs/sidebar.js" type="application/javascript"></script>
     <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/syncedtabs/sidebar.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/"/>
-    <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/textbox.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/content/browser.css"/>
     <title>&syncedTabs.sidebar.label;</title>
   </head>
 
   <body dir="&locale.dir;" role="application">
     <template id="client-template">
       <div class="item client" role="option" tabindex="-1">
         <div class="item-title-container">
--- a/toolkit/content/widgets.css
+++ b/toolkit/content/widgets.css
@@ -24,10 +24,12 @@
 @import url("chrome://global/skin/notification.css");
 @import url("chrome://global/skin/popup.css");
 @import url("chrome://global/skin/progressmeter.css");
 @import url("chrome://global/skin/radio.css");
 @import url("chrome://global/skin/richlistbox.css");
 @import url("chrome://global/skin/scrollbox.css");
 @import url("chrome://global/skin/splitter.css");
 @import url("chrome://global/skin/tabbox.css");
+@import url("chrome://global/content/textbox.css");
+@import url("chrome://global/skin/textbox.css");
 @import url("chrome://global/skin/toolbar.css");
 @import url("chrome://global/skin/wizard.css");
--- a/toolkit/content/widgets/datetimebox.xml
+++ b/toolkit/content/widgets/datetimebox.xml
@@ -13,21 +13,16 @@
    xmlns="http://www.mozilla.org/xbl"
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="date-input"
            simpleScopeChain="true"
            extends="chrome://global/content/bindings/datetimebox.xml#datetime-input-base">
-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-    </resources>
-
     <implementation>
       <constructor>
       <![CDATA[
         /* eslint-disable no-multi-spaces */
         this.mYearPlaceHolder = ]]>"&date.year.placeholder;"<![CDATA[;
         this.mMonthPlaceHolder = ]]>"&date.month.placeholder;"<![CDATA[;
         this.mDayPlaceHolder = ]]>"&date.day.placeholder;"<![CDATA[;
 
@@ -426,21 +421,16 @@
       </method>
 
     </implementation>
   </binding>
 
   <binding id="time-input"
            simpleScopeChain="true"
            extends="chrome://global/content/bindings/datetimebox.xml#datetime-input-base">
-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-    </resources>
-
     <implementation>
       <property name="kMsPerSecond" readonly="true" onget="return 1000;" />
       <property name="kMsPerMinute" readonly="true" onget="return (60 * 1000);" />
 
       <constructor>
       <![CDATA[
         const kDefaultAMString = "AM";
         const kDefaultPMString = "PM";
@@ -1192,21 +1182,16 @@
         ]]>
         </body>
       </method>
     </implementation>
   </binding>
 
   <binding id="datetime-input-base"
            simpleScopeChain="true">
-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-    </resources>
-
     <content>
       <html:div class="datetime-input-box-wrapper" anonid="input-box-wrapper"
                 xbl:inherits="context,disabled,readonly" role="presentation">
         <html:span class="datetime-input-edit-wrapper"
                    anonid="edit-wrapper">
           <!-- Each of the date/time input types will append their input child
              - elements here -->
         </html:span>
--- a/toolkit/content/widgets/textbox.xml
+++ b/toolkit/content/widgets/textbox.xml
@@ -14,21 +14,16 @@
 
 <bindings id="textboxBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="textbox">
-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-    </resources>
-
     <content>
       <children/>
       <xul:moz-input-box anonid="moz-input-box" flex="1" xbl:inherits="context,spellcheck">
         <html:input class="textbox-input" anonid="input"
                     xbl:inherits="value,type,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,noinitialfocus,mozactionhint,spellcheck"/>
       </xul:moz-input-box>
     </content>