From 9bd002e41dd100fdaaeb71d0886cfa13d0b4a91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemek=20Weso=C5=82ek?= Date: Mon, 8 Aug 2016 12:16:48 +0200 Subject: [PATCH] Change the order of static content generation. (#2528) Prevents the `--rendertiddlers` removing the `static.css` file rendered earlier, similar to https://github.com/Jermolene/TiddlyWiki5/pull/1207 and https://github.com/Jermolene/TiddlyWiki5/issues/703. --- editions/empty/tiddlywiki.info | 4 ++-- editions/server/tiddlywiki.info | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info index 6d24d2bd1..33d88c66f 100644 --- a/editions/empty/tiddlywiki.info +++ b/editions/empty/tiddlywiki.info @@ -17,7 +17,7 @@ "static": [ "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"] + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"], + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain" } } \ No newline at end of file diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info index ac7bd0aad..d851a0a11 100644 --- a/editions/server/tiddlywiki.info +++ b/editions/server/tiddlywiki.info @@ -20,7 +20,7 @@ "static": [ "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"] + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"], + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain" } }