Bug 1419600 - Remove the dialogheader binding. r?bgrins
MozReview-Commit-ID: KbavddjDiH3
--- a/toolkit/content/widgets/dialog.xml
+++ b/toolkit/content/widgets/dialog.xml
@@ -432,19 +432,9 @@
if (btn)
btn.setAttribute("default", event.originalTarget == btn || !(event.originalTarget instanceof Components.interfaces.nsIDOMXULButtonElement));
</handler>
#endif
</handlers>
</binding>
- <binding id="dialogheader">
- <resources>
- <stylesheet src="chrome://global/skin/dialog.css"/>
- </resources>
- <content>
- <xul:label class="dialogheader-title" xbl:inherits="value=title,crop" crop="right" flex="1"/>
- <xul:label class="dialogheader-description" xbl:inherits="value=description"/>
- </content>
- </binding>
-
</bindings>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -980,20 +980,16 @@ stringbundle {
/********** dialog **********/
dialog,
dialog:root /* override :root from above */ {
-moz-binding: url("chrome://global/content/bindings/dialog.xml#dialog");
-moz-box-orient: vertical;
}
-dialogheader {
- -moz-binding: url("chrome://global/content/bindings/dialog.xml#dialogheader");
-}
-
/********* page ************/
page {
-moz-box-orient: vertical;
}
/********** wizard **********/
--- a/toolkit/themes/osx/global/dialog.css
+++ b/toolkit/themes/osx/global/dialog.css
@@ -18,57 +18,16 @@ dialog {
}
/* ::::: dialog buttons ::::: */
.dialog-button {
font: menu;
}
-/* ::::: dialog header ::::: */
-
-dialogheader {
- margin: 0 5px 5px;
- padding: 5px 8px;
-}
-
-.dialogheader-title {
- margin: 0 !important;
- font-size: larger;
- font-weight: bold;
- display: none;
-}
-
-/* ::::: large dialog header ::::: */
-
-.header-large {
- -moz-box-orient: vertical;
- margin: -14px -14px 0;
- padding: 12px;
- padding-inline-end: 5px;
- padding-inline-start: 25px;
-}
-
-.header-large > .dialogheader-title {
- font: inherit;
- font-weight: bold;
-}
-
-.header-large > .dialogheader-description {
- margin-left: 12px !important;
-}
-
-.dialogheader-description {
- font-weight: bold !important;
-}
-
-.dialogheader-title {
- font-weight: bold !important;
-}
-
/*XXX - belongs to toolkit/content/finddialog.xul: */
#findDialog,
#findDialog > menu,
#findDialog > groupbox {
font: menu !important;
}
--- a/toolkit/themes/windows/global/dialog.css
+++ b/toolkit/themes/windows/global/dialog.css
@@ -19,56 +19,8 @@ dialog {
/* ::::: dialog buttons ::::: */
.dialog-button {
font: menu;
margin-top: 6px;
}
-/* ::::: dialog header ::::: */
-
-dialogheader {
- margin: 0px 5px 5px 5px;
- border: 2px solid;
- -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
- -moz-border-right-colors: ThreeDHighlight ThreeDDarkShadow;
- -moz-border-bottom-colors: ThreeDHighlight ThreeDDarkShadow;
- -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
- padding: 5px 8px;
- background-color: Highlight;
- color: HighlightText;
-}
-
-.dialogheader-title {
- margin: 0px !important;
- font-size: larger;
- font-weight: bold;
-}
-
-/* ::::: large dialog header ::::: */
-
-.header-large {
- -moz-box-orient: vertical;
- margin-top: -8px;
- margin-bottom: 0;
- margin-inline-start: -8px;
- margin-inline-end: -10px;
- border-left: none;
- border-right: none;
- border-top: none;
- -moz-border-bottom-colors: ThreeDHighlight ThreeDShadow;
- padding-top: 12px;
- padding-bottom: 12px;
- padding-inline-start: 25px;
- padding-inline-end: 5px;
- background-color: Window;
- color: WindowText;
-}
-
-.header-large > .dialogheader-title {
- font: inherit;
- font-weight: bold;
-}
-
-.header-large > .dialogheader-description {
- margin-inline-start: 12px !important;
-}