Bug 1596635 - Move four Calendar CSS overlays from jar.mn to .xul files. r=darktrojan
authorPaul Morris <paul@thunderbird.net>
Thu, 14 Nov 2019 17:17:12 -0500
changeset 36647 430487e62ffd051ea2047205d10f3993587390c7
parent 36646 e2110a70a56383bdb768434b54d3fd05849c3184
child 36648 0f435d1559190627ecdfa9f8162a9b32275b88b3
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1596635
Bug 1596635 - Move four Calendar CSS overlays from jar.mn to .xul files. r=darktrojan
calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
calendar/base/content/dialogs/calendar-event-dialog.xul
calendar/base/jar.mn
calendar/lightning/content/messenger-overlay-messageWindow.xul
calendar/lightning/jar.mn
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
@@ -1,16 +1,17 @@
 <?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/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-attendees.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
 ]>
 
--- a/calendar/base/content/dialogs/calendar-event-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xul
@@ -2,20 +2,24 @@
 <!-- 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/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-alarms.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-attendees.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
+#ifdef MOZ_SUITE
+<?xml-stylesheet type="text/css" href="chrome://communicator/skin/communicator.css"?>
+#endif
 
 <!DOCTYPE dialog [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
     <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %brandDTD;
     %globalDTD;
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -94,18 +94,16 @@ calendar.jar:
     content/calFilter.js                                        (src/calFilter.js)
     content/WindowsNTToZoneInfoTZId.properties                  (src/WindowsNTToZoneInfoTZId.properties)
 % skin calendar classic/1.0 %skin/linux/
 % skin calendar classic/1.0 %skin/osx/ os=Darwin
 % skin calendar classic/1.0 %skin/windows/ os=WINNT
 % skin calendar-common classic/1.0 %skin/common/
 % style chrome://messenger/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
 % style chrome://messenger/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
-% style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
     skin/common/calendar-alarms.css                             (themes/common/calendar-alarms.css)
     skin/common/calendar-attendees.css                          (themes/common/calendar-attendees.css)
     skin/common/calendar-creation-wizard.css                    (themes/common/calendar-creation-wizard.css)
     skin/common/calendar-daypicker.css                          (themes/common/calendar-daypicker.css)
     skin/common/calendar-itip-icons.svg                         (themes/common/calendar-itip-icons.svg)
     skin/common/calendar-occurrence-prompt.css                  (themes/common/calendar-occurrence-prompt.css)
     skin/common/calendar-occurrence.svg                         (themes/common/calendar-occurrence.svg)
     skin/common/calendar-preferences.css                        (themes/common/calendar-preferences.css)
--- a/calendar/lightning/content/messenger-overlay-messageWindow.xul
+++ b/calendar/lightning/content/messenger-overlay-messageWindow.xul
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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/. -->
 
+<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+
 <overlay id="messsenger-overlay-messageWindow"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
     <script src="chrome://calendar/content/calendar-statusbar.js"/>
     <script src="chrome://calendar/content/calendar-item-editing.js"/>
 </overlay>
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -47,19 +47,17 @@ lightning.jar:
     content/caldav-lightning-calendar-creation.js          (../providers/caldav/content/caldav-lightning-calendar-creation.js)
     content/caldav-lightning-calendar-properties.js        (../providers/caldav/content/caldav-lightning-calendar-properties.js)
     content/caldav-lightning-utils.js                      (../providers/caldav/content/caldav-lightning-utils.js)
 
 % skin lightning classic/1.0 %skin/linux/
 % skin lightning classic/1.0 %skin/osx/ os=Darwin
 % skin lightning classic/1.0 %skin/windows/ os=WINNT
 % skin lightning-common classic/1.0 %skin/lightning-common/
-% style chrome://messenger/content/messageWindow.xul chrome://lightning/skin/lightning.css
 % style chrome://messenger/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://communicator/skin/communicator.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://messenger/content/customizeToolbar.xul chrome://lightning-common/skin/lightning.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://messenger/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
     skin/lightning-common/accountCentral.css               (themes/common/accountCentral.css)
     skin/lightning-common/html-item-editing.css            (themes/common/html-item-editing.css)
     skin/lightning-common/todayButton-arrow.svg            (themes/common/images/todayButton-arrow.svg)
     skin/lightning-common/imip.css                         (themes/common/imip.css)
     skin/lightning-common/lightning.css                    (themes/common/lightning.css)
     skin/lightning-common/lightning-toolbar.css            (themes/common/lightning-toolbar.css)