Bug 1446009 - Remove groupbox-base binding by moving groupbox.css into components.css
MozReview-Commit-ID: 1XVuuXNX0Eq
--- a/toolkit/content/components.css
+++ b/toolkit/content/components.css
@@ -1,10 +1,11 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* ===== components.css =================================================
== Styles ported from XBL <resources>, loaded as UA styles in every XUL doc
======================================================================= */
+@import url("chrome://global/skin/groupbox.css");
@import url("chrome://global/skin/menu.css");
@import url("chrome://global/skin/toolbar.css");
--- a/toolkit/content/widgets/groupbox.xml
+++ b/toolkit/content/widgets/groupbox.xml
@@ -4,39 +4,28 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<bindings id="groupboxBindings"
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="groupbox-base">
- <resources>
- <stylesheet src="chrome://global/skin/groupbox.css"/>
- </resources>
- </binding>
-
- <binding id="groupbox"
- extends="chrome://global/content/bindings/groupbox.xml#groupbox-base">
+ <binding id="groupbox">
<content>
<xul:hbox class="groupbox-title" align="center" pack="start">
<children includes="caption"/>
</xul:hbox>
<xul:box flex="1" class="groupbox-body" xbl:inherits="orient,align,pack">
<children/>
</xul:box>
</content>
</binding>
<binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
- <resources>
- <stylesheet src="chrome://global/skin/groupbox.css"/>
- </resources>
-
<content>
<children>
<xul:image class="caption-icon" xbl:inherits="src=image"/>
<xul:label class="caption-text" flex="1"
xbl:inherits="default,value=label,crop,accesskey"/>
</children>
</content>
</binding>