Bug 1608610 - Inline calendar CSS files from jar.mn files. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Wed, 15 Jan 2020 16:07:43 -0500
changeset 38129 b27c5d446d95d74656fcbebc4b37568b6d98a746
parent 38128 30b1085f2a92db5613123de5c12dc55019a112fa
child 38130 20890131209c2148fd2318ad2eed4e5aabc9f12a
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersFallen
bugs1608610
Bug 1608610 - Inline calendar CSS files from jar.mn files. r=Fallen
calendar/base/jar.mn
calendar/lightning/jar.mn
common/src/customizeToolbar.xhtml
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -92,18 +92,16 @@ calendar.jar:
     content/calendar-subscriptions-list.js                      (content/widgets/calendar-subscriptions-list.js)
     content/calApplicationUtils.js                              (src/calApplicationUtils.js)
     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.xhtml chrome://calendar/skin/calendar-task-view.css
-% style chrome://messenger/content/customizeToolbar.xhtml 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/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -35,17 +35,16 @@ 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/customizeToolbar.xhtml chrome://lightning/skin/lightning-toolbar.css
     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)
     skin/lightning-common/suite-accountCentral.css         (themes/common/suite-accountCentral.css)
     skin/lightning-common/datetimepickers.css              (../resources/skin/datetimepickers.css)
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -24,16 +24,19 @@
 <?xml-stylesheet href="chrome://messenger/content/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
 #endif
+<?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.css" type="text/css"?>
 
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
 #ifdef MOZ_SUITE
         onload="onLoad();"
 #else
         windowtype="mailnews:customizeToolbar"
         onload="overlayOnLoad();"