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

Heavy rework for usertheme parents.

Browse Source
This commit is contained in:
David Bolack
2024-03-06 18:55:12 -06:00
parent 9adafbd473
commit 87502f4249
4 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,13 +200,15 @@ const BrewRenderer = (props)=>{
rendererPath += '/';
}
if(baseThemePath && baseThemePath[0] === '#') {
baseThemePath = baseThemePath.slice(1);
if(rendererPath == '') {
baseThemePath = 'Brew';
baseRendererPath = '';
} else {
baseRendererPath += '/';
}
const staticOrUserParent = props?.theme[0] == '#' ? `/cssParent/${themePath}` : `/css/${baseRendererPath}${baseThemePath}`;
return (
<>
{/*render dummy page while iFrame is mounting.*/}
@@ -235,7 +237,7 @@ const BrewRenderer = (props)=>{
</div>
<link href={`/css/${blankRendererPath}/Blank`} rel='stylesheet'/>
{baseThemePath &&
<link href={`/css/${baseRendererPath}${baseThemePath}`} rel='stylesheet'/>
<link href={staticOrUserParent} rel='stylesheet'/>
}
<link href={`/css/${rendererPath}${themePath}`} rel='stylesheet'/>

9
client/homebrew/pages/printPage/printPage.jsx
View File

@@ -110,19 +110,20 @@ const PrintPage = createClass({
rendererPath += '/';
}
if(baseThemePath && baseThemePath[0] == '#') {
baseThemePath = baseThemePath.slice(1);
if(rendererPath == '') {
baseThemePath = 'Brew';
baseRendererPath = '';
} else {
baseRendererPath += '/';
}
const staticOrUserParent = this.state.brew.theme[0] == '#' ? `/cssParent/${themePath}` : `/css/${baseRendererPath}${baseThemePath}`;
return <div>
<Meta name='robots' content='noindex, nofollow' />
<link href={`/css/${blankRendererPath}/Blank`} rel='stylesheet'/>
{baseThemePath &&
<link href={`/css/${baseRendererPath}${baseThemePath}`} rel='stylesheet'/>
<link href={staticOrUserParent} rel='stylesheet'/>
}
<link href={`/css/${rendererPath}${themePath}`} rel='stylesheet'/>
{/* Apply CSS from Style tab */}