Cherry pick of config changes

This commit is contained in:
Knut Sveidqvist
2020-08-14 07:34:42 +02:00
parent a97cc62d0a
commit 129b3f9004
4 changed files with 37 additions and 3 deletions

View File

@@ -49,7 +49,6 @@ export const updateCurrentConfig = (siteCfg, _directives) => {
* @returns {*} - the siteConfig
*/
export const setSiteConfig = conf => {
console.warn('Setting site config');
siteConfig = assignWithDepth({}, defaultConfig);
siteConfig = assignWithDepth(siteConfig, conf);
@@ -138,6 +137,15 @@ export const sanitize = options => {
};
export const addDirective = directive => {
if (directive.fontFamily) {
if (!directive.themeVariables) {
directive.themeVariables = { fontFamily: directive.fontFamily };
} else {
if (!directive.themeVariables.fontFamily) {
directive.themeVariables = { fontFamily: directive.fontFamily };
}
}
}
directives.push(directive);
updateCurrentConfig(siteConfig, directives);
};