Bug 1473623 - Load "notification.css" as a document stylesheet. r=bgrins draft
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Thu, 05 Jul 2018 17:07:09 +0100
changeset 814535 95d827262f7ee6727dc5b4ab7dd81bfa7bc2a802
parent 814496 7d0fe549b57a0938fbb8090e5a17336a7bc1d369
push id115253
push userpaolo.mozmail@amadzone.org
push dateThu, 05 Jul 2018 16:15:40 +0000
reviewersbgrins
bugs1473623
milestone63.0a1
Bug 1473623 - Load "notification.css" as a document stylesheet. r=bgrins MozReview-Commit-ID: 5kFQmQR7bmr
browser/components/translation/translation-infobar.xml
toolkit/content/widgets.css
toolkit/content/widgets/notification.xml
--- a/browser/components/translation/translation-infobar.xml
+++ b/browser/components/translation/translation-infobar.xml
@@ -10,19 +10,16 @@
 %translationDTD;
 ]>
 
 <bindings id="translationBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
   <binding id="translationbar" extends="chrome://global/content/bindings/notification.xml#notification">
-    <resources>
-      <stylesheet src="chrome://global/skin/notification.css"/>
-    </resources>
     <content>
       <xul:hbox anonid="details" align="center" flex="1">
         <xul:image class="translate-infobar-element messageImage"
                    anonid="messageImage"/>
         <xul:panel anonid="welcomePanel" class="translation-welcome-panel"
                    type="arrow" align="start">
           <xul:image class="translation-welcome-logo"/>
           <xul:vbox flex="1" class="translation-welcome-content">
--- a/toolkit/content/widgets.css
+++ b/toolkit/content/widgets.css
@@ -3,8 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== widgets.css =====================================================
    == Styles ported from XBL <resources>, loaded by "global.css".
    ======================================================================= */
 
 @import url("chrome://global/skin/menu.css");
 @import url("chrome://global/skin/menulist.css");
+@import url("chrome://global/skin/notification.css");
--- a/toolkit/content/widgets/notification.xml
+++ b/toolkit/content/widgets/notification.xml
@@ -409,19 +409,16 @@
       </xul:hbox>
       <xul:toolbarbutton ondblclick="event.stopPropagation();"
                          class="messageCloseButton close-icon tabbable"
                          anonid="close-button"
                          xbl:inherits="hidden=hideclose"
                          tooltiptext="&closeNotification.tooltip;"
                          oncommand="document.getBindingParent(this).dismiss();"/>
     </content>
-    <resources>
-      <stylesheet src="chrome://global/skin/notification.css"/>
-    </resources>
     <implementation>
       <property name="label" onset="this.setAttribute('label', val); return val;"
                              onget="return this.getAttribute('label');"/>
       <property name="value" onset="this.setAttribute('value', val); return val;"
                              onget="return this.getAttribute('value');"/>
       <property name="image" onset="this.setAttribute('image', val); return val;"
                              onget="return this.getAttribute('image');"/>
       <property name="type" onset="this.setAttribute('type', val); return val;"
@@ -551,19 +548,16 @@
         <xul:button anonid="button"
                     class="popup-notification-button"
                     default="true"
                     label="&defaultButton.label;"
                     accesskey="&defaultButton.accesskey;"
                     xbl:inherits="oncommand=buttoncommand,label=buttonlabel,accesskey=buttonaccesskey,highlight=buttonhighlight,disabled=mainactiondisabled"/>
       </xul:hbox>
     </content>
-    <resources>
-      <stylesheet src="chrome://global/skin/notification.css"/>
-    </resources>
     <implementation>
       <field name="checkbox" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "checkbox");
       </field>
       <field name="closebutton" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "closebutton");
       </field>
       <field name="button" readonly="true">