From a6493da3ba7809dad4fd482936449e5649fa3a01 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 3 Jun 2023 09:30:56 -0300 Subject: content: generatePageLayout: divide style rules, apply default color --- src/content/dependencies/generatePageLayout.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/content/dependencies/generatePageLayout.js') diff --git a/src/content/dependencies/generatePageLayout.js b/src/content/dependencies/generatePageLayout.js index be61a6cd..32effbfe 100644 --- a/src/content/dependencies/generatePageLayout.js +++ b/src/content/dependencies/generatePageLayout.js @@ -2,6 +2,7 @@ import {empty, openAggregate} from '../../util/sugar.js'; export default { contentDependencies: [ + 'generateColorStyleRules', 'generateFooterLocalizationLinks', 'generateStickyHeadingContainer', 'transformContent', @@ -19,6 +20,7 @@ export default { sprawl({wikiInfo}) { return { footerContent: wikiInfo.footerContent, + wikiColor: wikiInfo.color, wikiName: wikiInfo.nameShort, }; }, @@ -41,6 +43,9 @@ export default { relations.defaultFooterContent = relation('transformContent', sprawl.footerContent); + relations.defaultColorStyleRules = + relation('generateColorStyleRules', sprawl.wikiColor); + return relations; }, @@ -100,7 +105,12 @@ export default { socialEmbed: {type: 'html'}, - styleRules: { + colorStyleRules: { + validate: v => v.arrayOf(v.isString), + default: [], + }, + + additionalStyleRules: { validate: v => v.arrayOf(v.isString), default: [], }, @@ -456,9 +466,12 @@ export default { href: to('shared.staticFile', `site4.css?${cachebust}`), }), - html.tag('style', - {[html.onlyIfContent]: true}, - slots.styleRules), + html.tag('style', [ + (empty(slots.colorStyleRules) + ? relations.defaultColorStyleRules + : slots.colorStyleRules), + slots.additionalStyleRules, + ]), html.tag('script', { src: to('shared.staticFile', `lazy-loading.js?${cachebust}`), -- cgit 1.3.0-6-gf8a5