Bug 1474171 - Remove <resources> from XML files in common/. r=jorgk

--HG-- extra : rebase_source : b43c44d5420eb01d83aba76401e8a36e17aef2ef
2018-07-09 18:39:10 +02:00 · 2018-07-09 18:39:10 +02:00 · 7eb3b93110
--- a/common/bindings/datetimepicker.xml
+++ b/common/bindings/datetimepicker.xml
@ -23,17 +23,6 @@
  <binding id="datetimepicker-base"
           extends="chrome://global/content/bindings/general.xml#basecontrol">

-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-      <stylesheet src="chrome://global/skin/dropmarker.css"/>
-#ifdef MOZ_SUITE
-      <stylesheet src="chrome://communicator/skin/datetimepicker.css"/>
-#else
-      <stylesheet src="chrome://messenger/skin/datetimepicker.css"/>
-#endif
-    </resources>
-
    <content align="center">
      <xul:hbox class="datetimepicker-input-box" align="center"
                xbl:inherits="context,disabled,readonly">
--- a/common/bindings/numberbox.xml
+++ b/common/bindings/numberbox.xml
@ -11,10 +11,6 @@

  <binding id="numberbox" extends="chrome://messenger/content/textbox.xml#textbox">

-    <resources>
-      <stylesheet src="chrome://messenger/skin/numberbox.css"/>
-    </resources>
-
    <content>
      <xul:hbox class="textbox-input-box numberbox-input-box" flex="1" xbl:inherits="context,disabled,focused">
        <html:input class="numberbox-input textbox-input" anonid="input"
--- a/common/bindings/preferences.xml
+++ b/common/bindings/preferences.xml
@ -592,9 +592,6 @@

  <binding id="prefwindow"
           extends="chrome://global/content/bindings/dialog.xml#dialog">
-    <resources>
-      <stylesheet src="chrome://global/skin/preferences.css"/>
-    </resources>
    <content dlgbuttons="accept,cancel" persist="lastSelected screenX screenY"
             closebuttonlabel="&preferencesCloseButton.label;"
             closebuttonaccesskey="&preferencesCloseButton.accesskey;"
@ -1168,9 +1165,6 @@
  </binding>

  <binding id="prefpane">
-    <resources>
-      <stylesheet src="chrome://global/skin/preferences.css"/>
-    </resources>
    <content>
      <xul:vbox class="content-box" xbl:inherits="flex">
        <children/>
@ -1382,9 +1376,6 @@

  <binding id="panebutton" role="xul:listitem"
           extends="chrome://global/content/bindings/radio.xml#radio">
-    <resources>
-      <stylesheet src="chrome://global/skin/preferences.css"/>
-    </resources>
    <content>
      <xul:image class="paneButtonIcon" xbl:inherits="src"/>
      <xul:label class="paneButtonLabel" xbl:inherits="value=label"/>
--- a/common/bindings/spinbuttons.xml
+++ b/common/bindings/spinbuttons.xml
@ -12,14 +12,6 @@
  <binding id="spinbuttons"
           extends="chrome://global/content/bindings/general.xml#basecontrol">

-    <resources>
-#ifdef MOZ_SUITE
-      <stylesheet src="chrome://communicator/skin/spinbuttons.css"/>
-#else
-      <stylesheet src="chrome://messenger/skin/spinbuttons.css"/>
-#endif
-    </resources>
-
    <content>
      <xul:vbox class="spinbuttons-box" flex="1">
        <xul:button anonid="increaseButton" type="repeat" flex="1"
--- a/common/bindings/textbox.xml
+++ b/common/bindings/textbox.xml
@ -18,10 +18,6 @@
   xmlns:xbl="http://www.mozilla.org/xbl">

  <binding id="textbox" extends="xul:box" role="xul:textbox">
-    <resources>
-      <stylesheet src="chrome://global/content/textbox.css"/>
-      <stylesheet src="chrome://global/skin/textbox.css"/>
-    </resources>

    <content>
      <children/>
--- a/common/bindings/toolbar.xml
+++ b/common/bindings/toolbar.xml
@ -9,18 +9,7 @@
          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:xbl="http://www.mozilla.org/xbl">

-  <binding id="toolbar-base">
-    <resources>
-      <stylesheet src="chrome://global/skin/toolbar.css"/>
-    </resources>
-  </binding>
-
-  <binding id="toolbox"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar-base">
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar-base">
-#endif
+  <binding id="toolbox">
    <implementation>
      <field name="palette">
        null
@ -98,12 +87,7 @@
    </implementation>
  </binding>

-  <binding id="toolbar" role="xul:toolbar"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar-base">
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar-base">
-#endif
+  <binding id="toolbar" role="xul:toolbar">
    <implementation>
      <property name="toolbarName"
                onget="return this.getAttribute('toolbarname');"
@ -536,13 +520,7 @@
    </implementation>
  </binding>

-  <binding id="menubar" role="xul:menubar"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar-base"
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar-base"
-#endif
-           display="xul:menubar">
+  <binding id="menubar" role="xul:menubar" display="xul:menubar">
    <implementation>
       <field name="_active">false</field>
       <field name="_statusbar">null</field>
@ -586,21 +564,7 @@
    </handlers>
  </binding>

-  <binding id="toolbardecoration" role="xul:toolbarseparator"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar-base">
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar-base">
-#endif
-  </binding>
-
-  <binding id="toolbarpaletteitem"
-#ifdef MOZ_SUITE
-           extends="chrome://communicator/content/bindings/toolbar.xml#toolbar-base"
-#else
-           extends="chrome://messenger/content/toolbar.xml#toolbar-base"
-#endif
-           display="xul:button">
+  <binding id="toolbarpaletteitem" display="xul:button">
    <content>
      <xul:hbox class="toolbarpaletteitem-box" flex="1" xbl:inherits="type,place">
        <children/>
@ -638,9 +602,6 @@

  <binding id="menu-button" display="xul:menu"
           extends="chrome://global/content/bindings/button.xml#menu-button-base">
-    <resources>
-      <stylesheet src="chrome://global/skin/toolbarbutton.css"/>
-    </resources>

    <content>
      <children includes="observes|template|menupopup|panel|tooltip"/>
--- a/mail/base/content/bindings.css
+++ b/mail/base/content/bindings.css
@ -2,6 +2,12 @@
 * 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/. */

+@import url("chrome://global/content/textbox.css");
+@import url("chrome://global/skin/textbox.css");
+@import url("chrome://messenger/skin/numberbox.css");
+@import url("chrome://messenger/skin/spinbuttons.css");
+@import url("chrome://messenger/skin/datetimepicker.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

 toolbox {
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@ -37,7 +37,7 @@ messenger.jar:
    content/messenger/listbox.xml                   (../../common/bindings/listbox.xml)
    content/messenger/numberbox.xml                 (../../common/bindings/numberbox.xml)
    content/messenger/generalBindings.xml           (../../common/bindings/generalBindings.xml)
-*   content/messenger/spinbuttons.xml               (../../common/bindings/spinbuttons.xml)
+    content/messenger/spinbuttons.xml               (../../common/bindings/spinbuttons.xml)
 *   content/messenger/textbox.xml                   (../../common/bindings/textbox.xml)
 *   content/messenger/toolbar.xml                   (../../common/bindings/toolbar.xml)
    content/messenger/attachmentList.css            (content/attachmentList.css)
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@ -214,7 +214,7 @@ menulist:-moz-locale-dir(rtl) > .menulist-label-box {
  color: inherit !important;
 }

-.textbox-addressingWidget,
+textbox.textbox-addressingWidget,
 .dummy-row-cell:not(:first-child) {
  padding: 4px 2px !important;
  padding-inline-start: 5px !important;
@ -228,8 +228,8 @@ menulist:-moz-locale-dir(rtl) > .menulist-label-box {
  border-bottom-color: transparent;
 }

-.textbox-addressingWidget[focused="true"],
-.textbox-addressingWidget:hover {
+textbox.textbox-addressingWidget[focused="true"],
+textbox.textbox-addressingWidget:hover {
  background-color: -moz-field;
  border-color: var(--toolbarbutton-hover-bordercolor) !important;
 }
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@ -279,7 +279,7 @@ toolbar[nowindowdrag="true"] {
  color: inherit !important;
 }

-.textbox-addressingWidget,
+textbox.textbox-addressingWidget,
 .dummy-row-cell:not(:first-child) {
  border: 1px solid transparent !important;
  border-bottom-color: #C6C6C6 !important;
@ -293,8 +293,8 @@ toolbar[nowindowdrag="true"] {
  transition: border .2s, background-color .2s;
 }

-.textbox-addressingWidget[focused="true"],
-.textbox-addressingWidget:hover {
+textbox.textbox-addressingWidget[focused="true"],
+textbox.textbox-addressingWidget:hover {
  background-color: white;
  background-image: none;
  border-color: #C6C6C6 !important;
--- a/mail/themes/shared/mail/compacttheme.css
+++ b/mail/themes/shared/mail/compacttheme.css
@ -173,7 +173,7 @@ findbar,

 #msgIdentity,
 #msgSubject,
-.textbox-addressingWidget,
+textbox.textbox-addressingWidget,
 .dummy-row-cell:not(:first-child) {
  border-bottom-color: var(--composer-header-border-color) !important;
  color: var(--chrome-color);
@ -183,8 +183,8 @@ findbar,
 #msgIdentity:focus,
 #msgSubject:hover,
 #msgSubject[focused="true"],
-.textbox-addressingWidget:hover,
-.textbox-addressingWidget[focused="true"] {
+textbox.textbox-addressingWidget:hover,
+textbox.textbox-addressingWidget[focused="true"] {
  background-color: var(--lwt-toolbar-field-background-color);
  color: var(--lwt-toolbar-field-color);
  border-color: var(--lwt-toolbar-field-border-color) !important;
@ -192,7 +192,7 @@ findbar,

 #msgIdentity ::-moz-selection,
 #msgSubject ::-moz-selection,
-.textbox-addressingWidget ::-moz-selection {
+textbox.textbox-addressingWidget ::-moz-selection {
  background-color: var(--chrome-selection-background-color);
  color: var(--chrome-selection-color);
 }
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@ -174,7 +174,7 @@
  padding-bottom: 2px;
 }

-.textbox-addressingWidget,
+textbox.textbox-addressingWidget,
 .dummy-row-cell:not(:first-child) {
  margin-bottom: 2px !important;
  padding: 2px !important;
@ -184,14 +184,14 @@
 }

@media (-moz-windows-default-theme: 0) {
-  .textbox-addressingWidget,
+  textbox.textbox-addressingWidget,
  .dummy-row-cell:not(:first-child) {
    border-bottom-color: ThreeDShadow !important;
    margin-inline-end: 1px !important;
  }

-  .textbox-addressingWidget:hover,
-  .textbox-addressingWidget[focused="true"] {
+  textbox.textbox-addressingWidget:hover,
+  textbox.textbox-addressingWidget[focused="true"] {
    background-color: -moz-field;
    border-color: ThreeDShadow !important;
  }
@ -667,18 +667,19 @@ toolbar:not(:-moz-lwtheme) {
 /* ::::: addressing widget ::::: */

@media (-moz-windows-default-theme) {
-  .textbox-addressingWidget,
+  textbox.textbox-addressingWidget,
  .dummy-row-cell:not(:first-child) {
    border-bottom-color: #a9b7c9 !important;
  }

-  .textbox-addressingWidget:hover,
-  .textbox-addressingWidget[focused="true"] {
+  textbox.textbox-addressingWidget:hover,
+  textbox.textbox-addressingWidget[focused="true"] {
    background-color: -moz-field;
    border-color: #a9b7c9 !important;
  }

-  menulist {
+  menulist,
+  menulist[disabled="true"] {
    color: inherit;
    border: 1px solid;
    background: var(--toolbarbutton-hover-background);
@ -688,6 +689,10 @@ toolbar:not(:-moz-lwtheme) {
    transition-duration: 150ms;
  }

+  menulist[disabled="true"] {
+    opacity: 0.5;
+  }
+
  menulist:not([disabled="true"]):not([open="true"]):hover {
    background: var(--toolbarbutton-active-background);
    border-color: var(--toolbarbutton-active-bordercolor);
@ -699,7 +704,8 @@ toolbar:not(:-moz-lwtheme) {
    box-shadow: var(--toolbarbutton-active-boxshadow);
  }

-  .menulist-dropmarker {
+  .menulist-dropmarker,
+  .menulist-dropmarker[disabled="true"] {
    -moz-appearance: none;
    list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.svg");
    -moz-context-properties: fill;
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@ -485,7 +485,8 @@ treechildren::-moz-tree-cell-text(imapdeleted) {
 }

@media (-moz-windows-default-theme) {
-  menulist {
+  menulist,
+  menulist[disabled="true"] {
    -moz-appearance: none;
    min-height: 24px;
    color: inherit;
@ -499,6 +500,10 @@ treechildren::-moz-tree-cell-text(imapdeleted) {
    transition-duration: 150ms;
  }

+  menulist[disabled="true"] {
+    opacity: 0.5;
+  }
+
  menulist:not([disabled="true"]):not([open="true"]):hover {
    background: var(--toolbarbutton-active-background);
    border-color: var(--toolbarbutton-active-bordercolor);
@ -514,7 +519,8 @@ treechildren::-moz-tree-cell-text(imapdeleted) {
    opacity: .6;
  }

-  .menulist-dropmarker {
+  .menulist-dropmarker,
+  .menulist-dropmarker[disabled="true"] {
    -moz-appearance: none;
    list-style-image: url("chrome://messenger/skin/icons/toolbarbutton-arrow.svg");
    -moz-context-properties: fill;