From 1b6509bbc8811ee64716ad3ff0912d3c426e6dd0 Mon Sep 17 00:00:00 2001 From: "shaver%mozilla.org" Date: Tue, 12 Apr 2005 18:45:35 +0000 Subject: [PATCH] Use the lemony-fresh calendar-views.css so that we can actually show the views sanely in Lightning. NPOTB. --- calendar/lightning/chrome.manifest | 1 - .../lightning/content/messenger-overlay-sidebar.xul | 2 +- calendar/lightning/jar.mn | 10 +++++++++- calendar/lightning/themes/pinstripe/lightning.css | 3 +-- calendar/lightning/themes/winstripe/lightning.css | 3 +-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/calendar/lightning/chrome.manifest b/calendar/lightning/chrome.manifest index 2cfc2442fac0..a712faaf33c8 100644 --- a/calendar/lightning/chrome.manifest +++ b/calendar/lightning/chrome.manifest @@ -2,7 +2,6 @@ content lightning jar:chrome/lightning.jar!/content/lightning/ locale lightning en-US jar:chrome/en-US.jar!/locale/en-US/lightning/ overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul skin lightning classic/1.0 jar:chrome/classic.jar!/skin/classic/lightning/ - # shared pieces for chrome://calendar/ content calendar jar:chrome/calendar.jar!/content/calendar/ locale calendar en-US jar:chrome/calendar-en-US.jar!/locale/en-US/calendar/ diff --git a/calendar/lightning/content/messenger-overlay-sidebar.xul b/calendar/lightning/content/messenger-overlay-sidebar.xul index 7f6bd7ac13d9..4eb5db926159 100644 --- a/calendar/lightning/content/messenger-overlay-sidebar.xul +++ b/calendar/lightning/content/messenger-overlay-sidebar.xul @@ -3,7 +3,7 @@ - + diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn index 02db25cabe5a..a7d10ec5b042 100644 --- a/calendar/lightning/jar.mn +++ b/calendar/lightning/jar.mn @@ -21,5 +21,13 @@ calendar-en-US.jar: locale/en-US/calendar/calendar.dtd (/calendar/resources/locale/en-US/calendar.dtd) classic.jar: -#expand skin/classic/calendar/calendar.css (/calendar/sunbird/themes/__THEME__/sunbird/calendar.css) #expand skin/classic/lightning/lightning.css (themes/__THEME__/lightning.css) +#expand skin/classic/calendar/calendar-views.css (/calendar/sunbird/themes/__THEME__/sunbird/calendar-views.css) +#expand skin/classic/calendar/prevnextarrow.png (/calendar/sunbird/themes/__THEME__/sunbird/prevnextarrow.png) +#expand skin/classic/calendar/pageupdown.png (/calendar/sunbird/themes/__THEME__/sunbird/pageupdown.png) +#expand skin/classic/calendar/dot.png (/calendar/resources/skin/classic/dot.png) +#expand skin/classic/calendar/dot_selected.png (/calendar/resources/skin/classic/dot_selected.png) +#expand skin/classic/calendar/all_day_event.png (/calendar/resources/skin/classic/all_day_event.png) +#expand skin/classic/calendar/all_day_event_hover.png (/calendar/resources/skin/classic/all_day_event_hover.png) +#expand skin/classic/calendar/all_day_event_down.png (/calendar/resources/skin/classic/all_day_event_down.png) +#expand skin/classic/calendar/week-view-corner.png (/calendar/resources/skin/classic/week-view-corner.png) diff --git a/calendar/lightning/themes/pinstripe/lightning.css b/calendar/lightning/themes/pinstripe/lightning.css index b642ebb38c21..1d3eb775f790 100644 --- a/calendar/lightning/themes/pinstripe/lightning.css +++ b/calendar/lightning/themes/pinstripe/lightning.css @@ -1,2 +1 @@ -// Skin-domain style rules for lightning UI (pinstripe version) - +/* Skin-domain style rules for lightning UI (pinstripe version) */ diff --git a/calendar/lightning/themes/winstripe/lightning.css b/calendar/lightning/themes/winstripe/lightning.css index b1f13ad85494..c4b8ac2b1686 100644 --- a/calendar/lightning/themes/winstripe/lightning.css +++ b/calendar/lightning/themes/winstripe/lightning.css @@ -1,2 +1 @@ -// Skin-domain style rules for lightning UI (winstripe version) - +/* Skin-domain style rules for lightning UI (winstripe version) */