From 97a5454d43cc76692688208dae21be8eece18a31 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 27 May 2025 16:23:35 -0300 Subject: content: generatePageLayout: internally process style tags --- src/content/dependencies/generatePageLayout.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js index e0332c8e..59c0be5f 100644 --- a/src/content/dependencies/generatePageLayout.js +++ b/src/content/dependencies/generatePageLayout.js @@ -594,16 +594,23 @@ export default { ])), ]); - const styleRulesCSS = - html.resolve(slots.styleRules, {normalize: 'string'}); + const fakeStyleTags = + slots.styleRules.map(rule => html.tag('style', rule)); + + const styleTagsCSS = + html.smush(/*slots.styleTags*/ fakeStyleTags) + .content + .map(tag => + html.resolve(tag.content, {normalize: 'string'})) + .join('\n\n'); const fallbackWallpaperStyleTag = - (styleRulesCSS.match(/body::before[^}]*background-image:/) + (styleTagsCSS.match(/body::before[^}]*background-image:/) ? '' : relations.wikiWallpaperStyleTag); const numWallpaperParts = - styleRulesCSS + styleTagsCSS .match(/\.wallpaper-part:nth-child/g) ?.length ?? 0; @@ -755,9 +762,7 @@ export default { fallbackWallpaperStyleTag, - html.tag('style', [ - slots.styleRules, - ]), + fakeStyleTags, html.tag('script', { src: to('staticLib.path', 'chroma-js/chroma.min.js'), -- cgit 1.3.0-6-gf8a5