From 7eb96ee6be6ce3129717a8a98669f9f43cec8dff Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Wed, 10 Jul 2024 17:46:51 -0400 Subject: [PATCH] Simplify brewRenderer output to only emit current theme Instead of Blank, Parent, and Theme, just make use of the @include chaining, to handle all parent themes down to and including Blank --- client/homebrew/brewRenderer/brewRenderer.jsx | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 918fdb5c9..4c77728fa 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -188,23 +188,11 @@ const BrewRenderer = (props)=>{ document.dispatchEvent(new MouseEvent('click')); }; - let brewThemeRendererPath = `${props?.renderer ? _.upperFirst(props.renderer) : 'V3'}`; + let rendererPath = ''; + let themePath = props.theme; - let themePath = props.theme ?? '5ePHB'; - const Themes = { ...staticThemes, ...props.userThemes }; - let staticOrUserParent; - let baseThemePath = null; - - if (!Themes[brewThemeRendererPath].hasOwnProperty(themePath)) { - brewThemeRendererPath = ''; - staticOrUserParent = `/cssParent/${themePath}`; - baseThemePath = 'Brew'; - } else { - baseThemePath = Themes[brewThemeRendererPath][themePath].baseTheme - brewThemeRendererPath += '/'; - staticOrUserParent = `/css/${brewThemeRendererPath}${baseThemePath}`; - - } + if (staticThemes[_.upperFirst(props.renderer)]?.[props.theme] !== undefined) //Change CSS path if is staticTheme + rendererPath = _.upperFirst(props.renderer) + '/'; return ( <> @@ -235,11 +223,7 @@ const BrewRenderer = (props)=>{ tabIndex={-1} style={{ height: state.height }}> - - {baseThemePath && - - } - + {/* Apply CSS from Style tab and render pages from Markdown tab */} {state.isMounted