Bug 1463320 - Remove the "wizard-base" binding and import the "wizard.css" file as a document stylesheet. r=bgrins
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Tue, 10 Jul 2018 14:39:35 +0100
changeset 816216 a34a6f54da753e87e778e477f2760753ebf519b6
parent 816215 d9682b4ae9898976ea45ffc238e60022e5e7ba9c
child 816217 0b45728b721042df9def2c5291e46b59cc6d248a
push id115778
push userbmo:mstriemer@mozilla.com
push dateTue, 10 Jul 2018 18:49:28 +0000
reviewersbgrins
bugs1463320
milestone63.0a1
Bug 1463320 - Remove the "wizard-base" binding and import the "wizard.css" file as a document stylesheet. r=bgrins MozReview-Commit-ID: JRw6jnAhql2
toolkit/content/widgets.css
toolkit/content/widgets/wizard.xml
toolkit/mozapps/update/content/updates.xml
toolkit/themes/osx/global/wizard.css
--- a/toolkit/content/widgets.css
+++ b/toolkit/content/widgets.css
@@ -14,8 +14,9 @@
 @import url("chrome://global/skin/groupbox.css");
 @import url("chrome://global/skin/menu.css");
 @import url("chrome://global/skin/menulist.css");
 @import url("chrome://global/skin/notification.css");
 @import url("chrome://global/skin/popup.css");
 @import url("chrome://global/skin/richlistbox.css");
 @import url("chrome://global/skin/splitter.css");
 @import url("chrome://global/skin/toolbar.css");
+@import url("chrome://global/skin/wizard.css");
--- a/toolkit/content/widgets/wizard.xml
+++ b/toolkit/content/widgets/wizard.xml
@@ -9,26 +9,17 @@
   %wizardDTD;
 ]>
 
 <bindings id="wizardBindings"
    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="wizard-base">
-    <resources>
-      <stylesheet src="chrome://global/skin/wizard.css"/>
-    </resources>
-  </binding>
-
   <binding id="wizard">
-    <resources>
-      <stylesheet src="chrome://global/skin/wizard.css"/>
-    </resources>
     <content>
       <xul:hbox class="wizard-header" anonid="Header"/>
 
       <xul:deck class="wizard-page-box" flex="1" anonid="Deck">
         <children includes="wizardpage"/>
       </xul:deck>
       <children/>
 
@@ -446,48 +437,48 @@
                group="system" action="this._hitEnter(event)"/>
       <handler event="keypress" keycode="VK_ESCAPE" group="system">
         if (!event.defaultPrevented)
           this.cancel();
       </handler>
     </handlers>
   </binding>
 
-  <binding id="wizardpage" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
+  <binding id="wizardpage">
     <implementation>
       <field name="pageIndex">-1</field>
 
       <property name="pageid" onget="return this.getAttribute('pageid');"
                               onset="this.setAttribute('pageid', val);"/>
 
       <property name="next"   onget="return this.getAttribute('next');"
                               onset="this.setAttribute('next', val);
                                      this.parentNode._accessMethod = 'random';
                                      return val;"/>
     </implementation>
   </binding>
 
 #ifdef XP_MACOSX
-  <binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
+  <binding id="wizard-header">
     <content>
       <xul:stack class="wizard-header-stack" flex="1">
         <xul:vbox class="wizard-header-box-1">
           <xul:vbox class="wizard-header-box-text">
             <xul:label class="wizard-header-label" xbl:inherits="xbl:text=label"/>
           </xul:vbox>
         </xul:vbox>
         <xul:hbox class="wizard-header-box-icon">
           <xul:spacer flex="1"/>
           <xul:image class="wizard-header-icon" xbl:inherits="src=iconsrc"/>
         </xul:hbox>
       </xul:stack>
     </content>
   </binding>
 
-  <binding id="wizard-buttons" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
+  <binding id="wizard-buttons">
     <content>
       <xul:vbox flex="1">
         <xul:hbox class="wizard-buttons-btm">
           <xul:button class="wizard-button" dlgtype="extra1" hidden="true"/>
           <xul:button class="wizard-button" dlgtype="extra2" hidden="true"/>
           <xul:button label="&button-cancel-mac.label;" class="wizard-button" dlgtype="cancel"/>
           <xul:spacer flex="1"/>
           <xul:button label="&button-back-mac.label;" accesskey="&button-back-mac.accesskey;"
@@ -508,29 +499,29 @@
         ]]></body>
       </method>
     </implementation>
 
   </binding>
 
 #else
 
-  <binding id="wizard-header" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
+  <binding id="wizard-header">
     <content>
       <xul:hbox class="wizard-header-box-1" flex="1">
         <xul:vbox class="wizard-header-box-text" flex="1">
           <xul:label class="wizard-header-label" xbl:inherits="xbl:text=label"/>
           <xul:label class="wizard-header-description" xbl:inherits="xbl:text=description"/>
         </xul:vbox>
         <xul:image class="wizard-header-icon" xbl:inherits="src=iconsrc"/>
       </xul:hbox>
     </content>
   </binding>
 
-  <binding id="wizard-buttons" extends="chrome://global/content/bindings/wizard.xml#wizard-base">
+  <binding id="wizard-buttons">
     <content>
       <xul:vbox class="wizard-buttons-box-1" flex="1">
         <xul:separator class="wizard-buttons-separator groove"/>
         <xul:hbox class="wizard-buttons-box-2">
           <xul:button class="wizard-button" dlgtype="extra1" hidden="true"/>
           <xul:button class="wizard-button" dlgtype="extra2" hidden="true"/>
           <xul:spacer flex="1" anonid="spacer"/>
 #ifdef XP_UNIX
--- a/toolkit/mozapps/update/content/updates.xml
+++ b/toolkit/mozapps/update/content/updates.xml
@@ -7,19 +7,16 @@
 <!DOCTYPE bindings SYSTEM "chrome://mozapps/locale/update/updates.dtd">
 
 <bindings id="updatesBindings"
           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="updateheader" extends="chrome://global/content/bindings/wizard.xml#wizard-header">
-    <resources>
-      <stylesheet src="chrome://global/skin/wizard.css"/>
-    </resources>
     <content>
       <xul:hbox class="wizard-header update-header" flex="1">
         <xul:vbox class="wizard-header-box-1">
           <xul:vbox class="wizard-header-box-text">
             <xul:label class="wizard-header-label" xbl:inherits="value=label"/>
           </xul:vbox>
         </xul:vbox>
       </xul:hbox>
--- a/toolkit/themes/osx/global/wizard.css
+++ b/toolkit/themes/osx/global/wizard.css
@@ -3,20 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 wizard {
   padding: 14px;
 }
 
-#header { 
-  display: inline !important;
-}
-
 .wizard-header {
   -moz-appearance: dialog;
 }
 
 .wizard-header-box-1 {
   color: #000;
 }