From 1e64ca04d8b3cef6e3ab1b9ccde80f24099620d7 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sun, 15 May 2022 23:08:44 -0400
Subject: [PATCH] BaseTheme is a separate file; not duplicated inside child
 theme

---
 client/homebrew/brewRenderer/brewRenderer.jsx | 6 ++++++
 themes/V3/5eDMG/style.less                    | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index 24c48b12b..918ec176e 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -13,6 +13,8 @@ const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
 const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
 const Frame = require('react-frame-component').default;
 
+const Themes = require('themes/themes.json');
+
 const PAGE_HEIGHT = 1056;
 const PPR_THRESHOLD = 50;
 
@@ -180,6 +182,7 @@ const BrewRenderer = createClass({
 		//Also render dummy page while iframe is mounting.
 		const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
 		const themePath    = this.props.theme ?? '5ePHB';
+		const baseThemePath = Themes[rendererPath][themePath].baseTheme;
 
 		return (
 			<React.Fragment>
@@ -203,6 +206,9 @@ const BrewRenderer = createClass({
 							<RenderWarnings />
 							<NotificationPopup />
 						</div>
+						{baseThemePath &&
+							<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/>
+						}
 						<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/>
 						{/* Apply CSS from Style tab and render pages from Markdown tab */}
 						{this.state.isMounted
diff --git a/themes/V3/5eDMG/style.less b/themes/V3/5eDMG/style.less
index ef40bacd4..50a3af0a3 100644
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -1,7 +1,3 @@
-@import (less) './themes/fonts/5e/fonts.less';
-@import (less) './themes/assets/assets.less';
-@import (less) './themes/V3/5ePHB/style.less';
-
 :root {
 	//Colors
 	--HB_Color_Accent                : #EBCEC3; // Salmon