Merge branch 'master' of https://github.com/naturalcrit/homebrewery

2026-01-17 05:52:42 +00:00 · 2023-01-30 20:34:15 +01:00
parent 1ebbd9c8ce 6226f3376a
commit 7fd7230e15
12 changed files with 2035 additions and 2023 deletions
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -134,7 +134,7 @@ const BrewRenderer = createClass({

 	renderStyle : function() {
 		if(!this.props.style) return;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${this.props.style} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
 	},

 	renderPage : function(pageText, index){
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -219,12 +219,13 @@ const ListPage = createClass({

 	render : function(){
 		return <div className='listPage sitePage'>
+			<style>@layer V3_5ePHB, bundle;</style>
 			<link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
 			{this.props.navItems}
 			{this.renderSortOptions()}

 			<div className='content V3'>
-				<div className='phb page'>
+				<div className='page'>
 					{this.renderBrewCollection(this.state.brewCollection)}
 				</div>
 			</div>
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -10,14 +10,14 @@
 	-moz-column-width    : auto;
 	-webkit-column-gap   : auto;
 	-moz-column-gap      : auto;
-}
-.listPage{
-	.content{
-		.phb{
-			.noColumns();
 	height               : auto;
 	min-height           : 279.4mm;
 	margin               : 20px auto;
+}
+.listPage{
+	.content{
+		.page{
+			.noColumns() !important; //Needed to override PHB Theme since this is on a lower @layer
 			&::after{
 				display : none;
 			}
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -60,7 +60,7 @@ const PrintPage = createClass({

 	renderStyle : function() {
 		if(!this.state.brew.style) return;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${this.state.brew.style} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
 	},

 	renderPages : function(){
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,8 +46,8 @@
        "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
      },
      "devDependencies": {
-        "eslint": "^8.32.0",
-        "eslint-plugin-react": "^7.32.1",
+        "eslint": "^8.33.0",
+        "eslint-plugin-react": "^7.32.2",
        "jest": "^29.4.1",
        "supertest": "^6.3.3"
      },
@@ -6186,9 +6186,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
+      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
      "dev": true,
      "dependencies": {
        "@eslint/eslintrc": "^1.4.1",
@@ -6242,9 +6242,9 @@
      }
    },
    "node_modules/eslint-plugin-react": {
-      "version": "7.32.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
-      "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
+      "version": "7.32.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
      "dev": true,
      "dependencies": {
        "array-includes": "^3.1.6",
@@ -21434,9 +21434,9 @@
      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
    },
    "eslint": {
-      "version": "8.32.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.32.0.tgz",
-      "integrity": "sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==",
+      "version": "8.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
+      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
      "dev": true,
      "requires": {
        "@eslint/eslintrc": "^1.4.1",
@@ -21553,9 +21553,9 @@
      }
    },
    "eslint-plugin-react": {
-      "version": "7.32.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.1.tgz",
-      "integrity": "sha512-vOjdgyd0ZHBXNsmvU+785xY8Bfe57EFbTYYk8XrROzWpr9QBvpjITvAXt9xqcE6+8cjR/g1+mfumPToxsl1www==",
+      "version": "7.32.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+      "integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
      "dev": true,
      "requires": {
        "array-includes": "^3.1.6",
--- a/package.json
+++ b/package.json
@@ -104,8 +104,8 @@
    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
  },
  "devDependencies": {
-    "eslint": "^8.32.0",
-    "eslint-plugin-react": "^7.32.1",
+    "eslint": "^8.33.0",
+    "eslint-plugin-react": "^7.32.2",
    "jest": "^29.4.1",
    "supertest": "^6.3.3"
  }
--- a/scripts/buildHomebrew.js
+++ b/scripts/buildHomebrew.js
@@ -20,7 +20,8 @@ const transforms = {
 };

 const build = async ({ bundle, render, ssr })=>{
-	const css = await lessTransform.generate({ paths: './shared' });
+	let css = await lessTransform.generate({ paths: './shared' });
+	css = `@layer bundle {\n${css}\n}`;
 	await fs.outputFile('./build/homebrew/bundle.css', css);
 	await fs.outputFile('./build/homebrew/bundle.js', bundle);
 	await fs.outputFile('./build/homebrew/ssr.js', ssr);
--- a/themes/Legacy/5ePHB/style.less
+++ b/themes/Legacy/5ePHB/style.less
@@ -1,3 +1,4 @@
+@layer Legacy_5ePHB {
 	@import (less) './themes/fonts/5e legacy/fonts.less';
 	@import (less) './themes/assets/assets.less';
 	@import (less) './themes/phb.depricated.less';
@@ -495,3 +496,4 @@ body {
 			margin-bottom : 10px;
 		}
 	}
+}
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -1,3 +1,4 @@
+@layer V3_5eDMG {
 	:root {
 		//Colors
 		--HB_Color_Accent                : #EBCEC3; // Salmon
@@ -17,3 +18,4 @@
 			bottom : 40px;
 		}
 	}
+}
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -1,3 +1,4 @@
+@layer V3_5ePHB {
 	@import (less) './themes/fonts/5e/fonts.less';
 	@import (less) './themes/assets/assets.less';

@@ -794,3 +795,4 @@ body {
 	.page h1 + *{
 		margin-top : 0;
 	}
+}
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -1,3 +1,4 @@
+@layer V3_Blank {
 	@import (less) './themes/fonts/5e/fonts.less';
 	@import (less) './themes/assets/assets.less';

@@ -274,3 +275,4 @@ body {
 			}
 		}
 	}
+}
--- a/themes/V3/Journal/style.less
+++ b/themes/V3/Journal/style.less
@@ -1,3 +1,4 @@
+@layer V3_Journal {
 	@import (less) './themes/fonts/Journal/fonts.less';
 	@import (less) './themes/assets/assets.less';

@@ -557,3 +558,4 @@
 	.page .wide {
 		margin-bottom       : 0.45cm;
 	}
+}