1596635 - Move some CSS overlay directives from jar.mn files to XUL files

Status: RESOLVED FIXED

(Calendar :: General, task)

Description

[Paul Morris [:pmorris]]

Some of these CSS overlays can be moved out of their jar.mn files and into their XUL (possibly XUL overlay) files:

https://searchfox.org/comm-central/search?q=%25+style&case=false&regexp=false&path=calendar

Looks like the five that overlay chrome://messenger/content/customizeToolbar.xul will need to stay as-is for now since there is no calendar overlay file that overlays customizeToolbar.xul. The other four can go.

Comment 1

[Paul Morris [:pmorris]]

Attachment: move-css-overlays-0.patch

Pretty straightforward.

Comment 2

[Geoff Lankow (:darktrojan)]

Comment on attachment 9108898 [details] [diff] [review]
move-css-overlays-0.patch

Review of attachment 9108898 [details] [diff] [review]:
-----------------------------------------------------------------

Four out of nine ain't bad? It's a shame we can't get rid of the customizeToolbar.xul ones too, but this'll do for now.

::: calendar/lightning/content/messenger-overlay-messageWindow.xul
@@ +5,5 @@
>  
>  <overlay id="messsenger-overlay-messageWindow"
>           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
> +
> +    <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>

That's … not where an XML processing instruction goes. Put it before the root element.

Comment 3

[Paul Morris [:pmorris]]

Attachment: move-css-overlays-1.patch

Ah, of course... Thanks for catching that.

Comment 4

[Richard Marti (:Paenglab)]

customizeToolbar.* is no more toolkit and under our control. Either we could add the stylesheet to customizeToolbar.xul or if we don't want a warning in console, when we get one when Lightning is disabled, we could add the stylesheet in customizeToolbar.js with a try/catch?

Comment 5

[Jorg K (CEST = GMT+2)]

Sorry, queries in BMO were broken this morning, bug 1596674, so I didn't see the bug. Will land later today.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/430487e62ffd
Move four Calendar CSS overlays from jar.mn to .xul files. r=darktrojan

Comment 7

[Paul Morris [:pmorris]]

(In reply to Richard Marti (:Paenglab) from comment #4)

customizeToolbar.* is no more toolkit and under our control. Either we could add the stylesheet to customizeToolbar.xul or if we don't want a warning in console, when we get one when Lightning is disabled, we could add the stylesheet in customizeToolbar.js with a try/catch?

Good to know. What we do for these stylesheets will depend on what we do with integrating calendar into TB. If calendar becomes a system add-on then we'd likely include the CSS files dynamically via calendar JS code. If calendar is directly integrated then we'd either use the pre-processor to add those CSS directives in customizeToolbar.xul, or just add them to it directly.