f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 03:42:38 +00:00
Code Wiki Activity

Simplify brewRenderer output to only emit current theme

Browse Source 
Instead of Blank, Parent, and Theme, just make use of the @include chaining, to handle all parent themes down to and including Blank
This commit is contained in:
Trevor Buckner
2024-07-10 17:46:51 -04:00
parent 27aebf0e3b
commit 7eb96ee6be
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -188,23 +188,11 @@ const BrewRenderer = (props)=>{
document.dispatchEvent(new MouseEvent('click')); document.dispatchEvent(new MouseEvent('click'));
}; };
let brewThemeRendererPath = `${props?.renderer ? _.upperFirst(props.renderer) : 'V3'}`; let rendererPath = '';
let themePath = props.theme;
let themePath = props.theme ?? '5ePHB'; if (staticThemes[_.upperFirst(props.renderer)]?.[props.theme] !== undefined) //Change CSS path if is staticTheme
const Themes = { ...staticThemes, ...props.userThemes }; rendererPath = _.upperFirst(props.renderer) + '/';
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}`;
}
return ( return (
<> <>
@@ -235,11 +223,7 @@ const BrewRenderer = (props)=>{
tabIndex={-1} tabIndex={-1}
style={{ height: state.height }}> style={{ height: state.height }}>
<link href={`/css/${props?.renderer ? props.renderer : 'V3'}/Blank`} type='text/css' rel='stylesheet'/> <link href={`/css/${rendererPath}${themePath}`} type='text/css' rel='stylesheet'/>
{baseThemePath &&
<link href={staticOrUserParent} type='text/css' rel='stylesheet'/>
}
<link href={`/css/${brewThemeRendererPath}${themePath}`} type='text/css' rel='stylesheet'/>
{/* Apply CSS from Style tab and render pages from Markdown tab */} {/* Apply CSS from Style tab and render pages from Markdown tab */}
{state.isMounted {state.isMounted