Bug 1490431 - in files shared with SM, include bindings.css stylesheet only for TB. r=jorgk DONTBUILD
authorRichard Marti <richard.marti@gmail.com>
Tue, 11 Sep 2018 21:25:04 +0200
changeset 33130 babac1433bfba508e186fba72edfa5bb3bc60ff1
parent 33129 916fc0f72124256d501e393ed37aeb4b0624c197
child 33131 37bdf33fc10c12f87f9229a9c6f7d56f3b3b9f01
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1490431
Bug 1490431 - in files shared with SM, include bindings.css stylesheet only for TB. r=jorgk DONTBUILD
mailnews/base/content/subscribe.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/jar.mn
--- a/mailnews/base/content/subscribe.xul
+++ b/mailnews/base/content/subscribe.xul
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 
 <!-- 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/. -->
 
+#ifndef MOZ_SUITE
+<?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
+#endif
 <?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>
-<!-- <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?> -->
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
 
 <dialog id="subscribeWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&subscribeDialog.title;"
         style="width: 44em; height: 33em;"
         persist="width height screenX screenY"
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <!-- 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/. -->
 
+#ifndef MOZ_SUITE
 <?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
+#endif
 <?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % filterEditorDTD SYSTEM "chrome://messenger/locale/FilterEditor.dtd">
   %filterEditorDTD;
   <!ENTITY % searchTermDTD SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd">
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -79,17 +79,17 @@ messenger.jar:
 *   content/messenger/msgAccountCentral.xul                                    (base/content/msgAccountCentral.xul)
     content/messenger/msgAccountCentral.js                                     (base/content/msgAccountCentral.js)
     content/messenger/msgFolderPickerOverlay.js                                (base/content/msgFolderPickerOverlay.js)
     content/messenger/renameFolderDialog.xul                                   (base/content/renameFolderDialog.xul)
     content/messenger/renameFolderDialog.js                                    (base/content/renameFolderDialog.js)
     content/messenger/retention.js                                             (base/content/retention.js)
     content/messenger/shareglue.js                                             (base/content/shareglue.js)
     content/messenger/subscribe.js                                             (base/content/subscribe.js)
-    content/messenger/subscribe.xul                                            (base/content/subscribe.xul)
+*   content/messenger/subscribe.xul                                            (base/content/subscribe.xul)
     content/messenger/virtualFolderListEdit.xul                                (base/content/virtualFolderListEdit.xul)
     content/messenger/virtualFolderListEdit.js                                 (base/content/virtualFolderListEdit.js)
 *   content/messenger/virtualFolderProperties.xul                              (base/content/virtualFolderProperties.xul)
     content/messenger/virtualFolderProperties.js                               (base/content/virtualFolderProperties.js)
     content/messenger/msgPrintEngine.js                                        (base/content/msgPrintEngine.js)
     content/messenger/msgPrintEngine.xul                                       (base/content/msgPrintEngine.xul)
 *   content/messenger/junkMailInfo.xul                                         (base/content/junkMailInfo.xul)
     content/messenger/junkCommands.js                                          (base/content/junkCommands.js)