Bug 1473922 - Load "button.css" as a document stylesheet. r=bgrins
MozReview-Commit-ID: 3dNZcwNxTMb
--- a/toolkit/content/widgets.css
+++ b/toolkit/content/widgets.css
@@ -5,16 +5,17 @@
/* ===== widgets.css =====================================================
== Styles ported from XBL <resources>, loaded by "global.css".
======================================================================= */
@import url("chrome://global/content/autocomplete.css");
@import url("chrome://global/skin/autocomplete.css");
@import url("chrome://formautofill-shared/skin/autocomplete-item.css");
@import url("chrome://formautofill/skin/autocomplete-item.css");
+@import url("chrome://global/skin/button.css");
@import url("chrome://global/skin/checkbox.css");
@import url("chrome://global/skin/colorpicker.css");
@import url("chrome://global/skin/datetimebox.css");
@import url("chrome://global/skin/datetimepopup.css");
@import url("chrome://global/skin/dialog.css");
@import url("chrome://global/skin/dropmarker.css");
@import url("chrome://global/skin/findBar.css");
@import url("chrome://global/skin/groupbox.css");
--- a/toolkit/content/widgets/button.xml
+++ b/toolkit/content/widgets/button.xml
@@ -187,20 +187,16 @@
this.fireAccessKeyButton(buttonBox, charPressedLower);
]]>
</handler>
</handlers>
</binding>
<binding id="button" display="xul:button"
extends="chrome://global/content/bindings/button.xml#button-base">
- <resources>
- <stylesheet src="chrome://global/skin/button.css"/>
- </resources>
-
<content>
<children includes="observes|template|menupopup|panel|tooltip"/>
<xul:hbox class="box-inherit button-box" xbl:inherits="align,dir,pack,orient"
align="center" pack="center" flex="1" anonid="button-box">
<xul:image class="button-icon" xbl:inherits="src=image"/>
<xul:label class="button-text" xbl:inherits="value=label,accesskey,crop,highlightable"/>
<xul:label class="button-highlightable-text" xbl:inherits="xbl:text=label,accesskey,crop,highlightable"/>
</xul:hbox>
@@ -326,20 +322,16 @@
event.preventDefault();
}
</handler>
</handlers>
</binding>
<binding id="menu-button" display="xul:menu"
extends="chrome://global/content/bindings/button.xml#menu-button-base">
- <resources>
- <stylesheet src="chrome://global/skin/button.css"/>
- </resources>
-
<content>
<children includes="observes|template|menupopup|panel|tooltip"/>
<xul:button class="box-inherit button-menubutton-button"
anonid="button" flex="1" allowevents="true"
xbl:inherits="disabled,crop,image,label,accesskey,command,
buttonover,buttondown,align,dir,pack,orient">
<children/>
</xul:button>