Merge branch 'master' into WatercolorImageMask

.gitignore

@@ -12,3 +12,5 @@ todo.md
 startDB.bat
 startMViewer.bat
 .vscode
+
+coverage

changelog.md

@@ -61,6 +61,16 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Saturday 18/02/2023 - v3.6.1
+{{taskList
+##### G-Ambatte
+
+* [x] Fix users not being removed from Authors list correctly
+
+Fixes issues [#2674](https://github.com/naturalcrit/homebrewery/issues/2674)
+}}
+
+
 ### Friday 23/01/2023 - v3.6.0
 {{taskList
 ##### calculuschild

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -134,7 +134,8 @@ const BrewRenderer = createClass({
 
 	renderStyle : function() {
 		if(!this.props.style) return;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
+		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.props.style}\n</style>` }} />;
 	},
 
 	renderPage : function(pageText, index){

client/homebrew/pages/printPage/printPage.jsx

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "engines": {
     "node": "16.11.x"
   },
@@ -69,7 +69,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
     "body-parser": "^1.20.1",
@@ -82,7 +82,7 @@
     "express-async-handler": "^1.2.0",
     "express-static-gzip": "2.1.7",
     "fs-extra": "11.1.0",
-    "googleapis": "110.0.0",
+    "googleapis": "111.0.0",
     "js-yaml": "^4.1.0",
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
@@ -91,22 +91,22 @@
     "marked-extended-tables": "^1.0.5",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.29.4",
-    "mongoose": "^6.9.0",
+    "mongoose": "^6.9.2",
     "nanoid": "3.3.4",
     "nconf": "^0.12.0",
     "npm": "^8.10.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-frame-component": "4.1.3",
-    "react-router-dom": "6.8.0",
+    "react-router-dom": "6.8.1",
     "sanitize-filename": "1.6.3",
     "superagent": "^6.1.0",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.33.0",
+    "eslint": "^8.34.0",
     "eslint-plugin-react": "^7.32.2",
-    "jest": "^29.4.1",
+    "jest": "^29.4.3",
     "supertest": "^6.3.3"
   }
 }

server/homebrew.api.js

@@ -317,8 +317,7 @@ If you believe you should have access to this brew, ask the file owner to invite
 					brew.textBin = zlib.deflateRawSync(brew.text);
 					brew.text = undefined;
 				}
-
+				brew.markModified('authors'); //Mongo will not properly update arrays without markModified()
-				// Otherwise, save the brew with updated author list
 				await brew.save()
 					.catch((err)=>{
 						throw { status: 500, message: err };

server/homebrew.api.spec.js

@@ -11,6 +11,7 @@ describe('Tests for api', ()=>{
 	let modelBrew;
 	let saveFunc;
 	let removeFunc;
+	let markModifiedFunc;
 	let saved;
 
 	beforeEach(()=>{
@@ -20,15 +21,18 @@ describe('Tests for api', ()=>{
 			return saved;
 		});
 		removeFunc = jest.fn(async function() {});
+		markModifiedFunc = jest.fn(()=>true);
 
 		modelBrew = (brew)=>({
 			...brew,
-			save     : saveFunc,
+			save         : saveFunc,
-			remove   : removeFunc,
+			remove       : removeFunc,
-			toObject : function() {
+			markModified : markModifiedFunc,
+			toObject     : function() {
 				delete this.save;
 				delete this.toObject;
 				delete this.remove;
+				delete this.markModified;
 				return this;
 			}
 		});
@@ -627,6 +631,7 @@ brew`);
 			await api.deleteBrew(req, res);
 
 			expect(api.getBrew).toHaveBeenCalled();
+			expect(markModifiedFunc).toHaveBeenCalled();
 			expect(model.findOne).toHaveBeenCalled();
 			expect(removeFunc).not.toHaveBeenCalled();
 			expect(saveFunc).toHaveBeenCalled();
@@ -716,6 +721,7 @@ brew`);
 			await api.deleteBrew(req, res);
 
 			expect(api.getBrew).toHaveBeenCalled();
+			expect(markModifiedFunc).toHaveBeenCalled();
 			expect(model.findOne).toHaveBeenCalled();
 			expect(removeFunc).not.toHaveBeenCalled();
 			expect(api.deleteGoogleBrew).toHaveBeenCalled();

shared/naturalcrit/splitPane/splitPane.less

@@ -22,7 +22,7 @@
 			vertical-align : middle;
 			text-align     : center;
 			i{
-				display   : block;
+				display   : block !important;
 				margin    : 10px 0px;
 				font-size : 6px;
 				color     : #666;

themes/Legacy/5ePHB/style.less

@@ -1,499 +1,497 @@
-@layer Legacy_5ePHB {
+@import (less) './themes/fonts/5e legacy/fonts.less';
-	@import (less) './themes/fonts/5e legacy/fonts.less';
+@import (less) './themes/assets/assets.less';
-	@import (less) './themes/assets/assets.less';
+@import (less) './themes/phb.depricated.less';
-	@import (less) './themes/phb.depricated.less';
+//Colors
-	//Colors
+@background            : #EEE5CE; // Light parchment
-	@background            : #EEE5CE; // Light parchment
+@noteGreen             : #e0e5c1; // Pastel green
-	@noteGreen             : #e0e5c1; // Pastel green
+@headerUnderline       : #c9ad6a; // Gold
-	@headerUnderline       : #c9ad6a; // Gold
+@horizontalRule        : #9c2b1b; // Maroon
-	@horizontalRule        : #9c2b1b; // Maroon
+@headerText            : #58180D; // Dark maroon
-	@headerText            : #58180D; // Dark maroon
+@monsterStatBackground : #FDF1DC; // Lighter parchment
-	@monsterStatBackground : #FDF1DC; // Lighter parchment
+@captionText           : #766649; // Brown
-	@captionText           : #766649; // Brown
+@page { margin: 0; }
-	@page { margin: 0; }
+body {
-	body {
+	counter-reset : phb-page-numbers;
-		counter-reset : phb-page-numbers;
+}
-	}
+*{
-	*{
+	-webkit-print-color-adjust : exact;
-		-webkit-print-color-adjust : exact;
+}
-	}
+.useSansSerif(){
-	.useSansSerif(){
+	font-family : ScalySans;
+	em{
 		font-family : ScalySans;
-		em{
+		font-style  : italic;
-			font-family : ScalySans;
+	}
-			font-style  : italic;
+	strong{
-		}
+		font-family    : ScalySans;
-		strong{
+		font-weight    : 800;
-			font-family    : ScalySans;
+		letter-spacing : -0.02em;
-			font-weight    : 800;
+	}
-			letter-spacing : -0.02em;
+}
+.useColumns(@multiplier : 1){
+	column-count         : 2;
+	column-fill          : auto;
+	column-gap           : 1cm;
+	column-width         : 8cm * @multiplier;
+	-webkit-column-count : 2;
+	-moz-column-count    : 2;
+	-webkit-column-width : 8cm * @multiplier;
+	-moz-column-width    : 8cm * @multiplier;
+	-webkit-column-gap   : 1cm;
+	-moz-column-gap      : 1cm;
+}
+.phb{
+	.useColumns();
+	counter-increment : phb-page-numbers;
+	position          : relative;
+	z-index           : 15;
+	box-sizing        : border-box;
+	overflow          : hidden;
+	height            : 279.4mm;
+	width             : 215.9mm;
+	padding           : 1.0cm 1.7cm;
+	padding-bottom    : 1.5cm;
+	background-color  : @background;
+	background-image  : @backgroundImage;
+	font-family       : BookSanity;
+	font-size         : 0.317cm;
+	text-rendering    : optimizeLegibility;
+	page-break-before : always;
+	page-break-after  : always;
+	contain           : size;
+	//*****************************
+	// *            BASE
+	// *****************************/
+	p{
+		padding-bottom : 0.8em;
+		line-height    : 1.269em;
+		&+p{
+			margin-top : -0.8em;
 		}
 	}
-	.useColumns(@multiplier : 1){
+	ul{
-		column-count         : 2;
+		margin-bottom       : 0.8em;
-		column-fill          : auto;
+		padding-left        : 1.4em;
-		column-gap           : 1cm;
+		line-height         : 1.269em;
-		column-width         : 8cm * @multiplier;
+		list-style-position : outside;
-		-webkit-column-count : 2;
+		list-style-type     : disc;
-		-moz-column-count    : 2;
-		-webkit-column-width : 8cm * @multiplier;
-		-moz-column-width    : 8cm * @multiplier;
-		-webkit-column-gap   : 1cm;
-		-moz-column-gap      : 1cm;
 	}
-	.phb{
+	ol{
-		.useColumns();
+		margin-bottom       : 0.8em;
-		counter-increment : phb-page-numbers;
+		padding-left        : 1.4em;
-		position          : relative;
+		line-height         : 1.269em;
-		z-index           : 15;
+		list-style-position : outside;
-		box-sizing        : border-box;
+		list-style-type     : decimal;
-		overflow          : hidden;
+	}
-		height            : 279.4mm;
+	//Indents after p or lists
-		width             : 215.9mm;
+	p+p, ul+p, ol+p{
-		padding           : 1.0cm 1.7cm;
+		text-indent : 1em;
-		padding-bottom    : 1.5cm;
+	}
-		background-color  : @background;
+	img{
-		background-image  : @backgroundImage;
+		z-index : -1;
-		font-family       : BookSanity;
+	}
-		font-size         : 0.317cm;
+	strong{
-		text-rendering    : optimizeLegibility;
+		font-weight    : bold;
-		page-break-before : always;
+		letter-spacing : 0.03em;
-		page-break-after  : always;
+	}
-		contain           : size;
+	em{
-		//*****************************
+		font-style : italic;
-		// *            BASE
+	}
-		// *****************************/
+	sup{
-		p{
+		vertical-align : super;
-			padding-bottom : 0.8em;
+		font-size      : smaller;
-			line-height    : 1.269em;
+		line-height    : 0;
-			&+p{
+	}
-				margin-top : -0.8em;
+	sub{
+		vertical-align : sub;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	//*****************************
+	// *           HEADERS
+	// *****************************/
+	h1,h2,h3,h4{
+		margin-top    : 0.2em;
+		margin-bottom : 0.2em;
+		font-family   : MrJeeves;
+		font-weight   : 800;
+		color         : @headerText;
+	}
+	h1{
+		column-span         : all;
+		font-size           : 0.987cm;
+		-webkit-column-span : all;
+		-moz-column-span    : all;
+		&+p::first-letter{
+			float       : left;
+			font-family : Solberry;
+			font-size   : 10em;
+			color       : #222;
+			line-height : 0.795em;
+		}
+	}
+	h2{
+		font-size : 0.705cm;
+	}
+	h3{
+		font-size     : 0.529cm;
+		border-bottom : 2px solid @headerUnderline;
+	}
+	h4{
+		margin-bottom : 0.00em;
+		font-size     : 0.458cm;
+	}
+	h5{
+		margin-bottom : 0.2em;
+		font-family   : ScalySansSmallCaps;
+		font-size     : 0.423cm;
+		font-weight   : 900;
+	}
+	//*****************************
+	// *          TABLE
+	// *****************************/
+	table{
+		.useSansSerif();
+		width         : 100%;
+		margin-bottom : 1em;
+		font-size     : 10pt;
+		thead{
+			display: table-row-group;
+			font-weight : 800;
+			th{
+				vertical-align : bottom;
+				padding-bottom : 0.3em;
+				padding-right  : 0.1em;
+				padding-left   : 0.1em;
 			}
 		}
-		ul{
+		tbody{
-			margin-bottom       : 0.8em;
+			tr{
-			padding-left        : 1.4em;
+				td{
-			line-height         : 1.269em;
+					padding : 0.3em 0.1em;
-			list-style-position : outside;
+				}
-			list-style-type     : disc;
+				&:nth-child(odd){
-		}
+					background-color : @noteGreen;
-		ol{
-			margin-bottom       : 0.8em;
-			padding-left        : 1.4em;
-			line-height         : 1.269em;
-			list-style-position : outside;
-			list-style-type     : decimal;
-		}
-		//Indents after p or lists
-		p+p, ul+p, ol+p{
-			text-indent : 1em;
-		}
-		img{
-			z-index : -1;
-		}
-		strong{
-			font-weight    : bold;
-			letter-spacing : 0.03em;
-		}
-		em{
-			font-style : italic;
-		}
-		sup{
-			vertical-align : super;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		sub{
-			vertical-align : sub;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		//*****************************
-		// *           HEADERS
-		// *****************************/
-		h1,h2,h3,h4{
-			margin-top    : 0.2em;
-			margin-bottom : 0.2em;
-			font-family   : MrJeeves;
-			font-weight   : 800;
-			color         : @headerText;
-		}
-		h1{
-			column-span         : all;
-			font-size           : 0.987cm;
-			-webkit-column-span : all;
-			-moz-column-span    : all;
-			&+p::first-letter{
-				float       : left;
-				font-family : Solberry;
-				font-size   : 10em;
-				color       : #222;
-				line-height : 0.795em;
-			}
-		}
-		h2{
-			font-size : 0.705cm;
-		}
-		h3{
-			font-size     : 0.529cm;
-			border-bottom : 2px solid @headerUnderline;
-		}
-		h4{
-			margin-bottom : 0.00em;
-			font-size     : 0.458cm;
-		}
-		h5{
-			margin-bottom : 0.2em;
-			font-family   : ScalySansSmallCaps;
-			font-size     : 0.423cm;
-			font-weight   : 900;
-		}
-		//*****************************
-		// *          TABLE
-		// *****************************/
-		table{
-			.useSansSerif();
-			width         : 100%;
-			margin-bottom : 1em;
-			font-size     : 10pt;
-			thead{
-				display: table-row-group;
-				font-weight : 800;
-				th{
-					vertical-align : bottom;
-					padding-bottom : 0.3em;
-					padding-right  : 0.1em;
-					padding-left   : 0.1em;
 				}
 			}
-			tbody{
-				tr{
-					td{
-						padding : 0.3em 0.1em;
-					}
-					&:nth-child(odd){
-						background-color : @noteGreen;
-					}
-				}
-			}
-		}
-		//*****************************
-		// *            NOTE
-		// *****************************/
-		blockquote{
-			.useSansSerif();
-			box-sizing          : border-box;
-			margin-bottom       : 1em;
-			padding             : 5px 10px;
-			background-color    : @noteGreen;
-			border-style        : solid;
-			border-width        : 11px;
-			border-image        : @noteBorderImage 11;
-			border-image-outset : 9px 0px;
-			box-shadow          : 1px 4px 14px #888;
-			p, ul{
-				font-size   : 0.352cm;
-				line-height : 1.083em;
-			}
-		}
-		//If a note starts a column, give it space at the top to render border
-		pre+blockquote, h2+blockquote, h3+blockquote, h4+blockquote, h5+blockquote {
-			margin-top : 13px;
-		}
-		//*****************************
-		// *    MONSTER STAT BLOCK
-		// *****************************/
-		hr+blockquote{
-			position         : relative;
-			padding-top      : 15px;
-			background-color : @monsterStatBackground;
-			border-style     : solid;
-			border-width     : 10px;
-			border-image     : @monsterBorderImageLegacy 10;
-			h2{
-				margin-top    : -8px;
-				margin-bottom : 0px;
-				&+p{
-					padding-bottom : 0px;
-				}
-			}
-			h3{
-				font-family   : ScalySans;
-				font-weight   : 400;
-				border-bottom : 1px solid @headerText;
-			}
-			hr+ul{
-				color : @headerText;
-			}
-			ul{
-				.useSansSerif();
-				padding-left : 1em;
-				font-size    : 0.352cm;
-			}
-			// Monster Ability table
-			hr+table{
-				margin              : 0;
-				background-color    : transparent;
-				border-style        : none;
-				border-image        : none;
-				tbody{
-					tr:nth-child(odd), tr:nth-child(even){
-						background-color : transparent;
-					}
-				}
-			}
-			table{
-				color : @headerText;
-			}
-			p+p{
-				margin-top     : 0em;
-				padding-bottom : 0.5em;
-				text-indent    : 0em;
-			}
-			//Triangle dividers
-			hr{
-				visibility       : visible;
-				height           : 6px;
-				margin           : 4px 0px;
-				background-image : @redTriangleImage;
-				background-size  : 100% 100%;
-				border           : none;
-			}
-		}
-		//Full Width
-		hr+hr+blockquote{
-			.useColumns(0.96);
-		}
-		//*****************************
-		// *           FOOTER
-		// *****************************/
-		&:after{
-			content          : "";
-			position         : absolute;
-			bottom           : 0px;
-			left             : 0px;
-			z-index          : 100;
-			height           : 50px;
-			width            : 100%;
-			background-image : @footerAccentImage;
-			background-size  : cover;
-		}
-		&:nth-child(even){
-			&:after{
-				transform : scaleX(-1);
-			}
-			.pageNumber{
-				left : 2px;
-			}
-			.footnote{
-				left       : 80px;
-				text-align : left;
-			}
-		}
-		.pageNumber{
-			position   : absolute;
-			right      : 2px;
-			bottom     : 22px;
-			width      : 50px;
-			font-size  : 0.9em;
-			color      : #c9ad6a;
-			text-align : center;
-			&.auto::after {
-				content : counter(phb-page-numbers);
-			}
-		}
-		.footnote{
-			position   : absolute;
-			right      : 80px;
-			bottom     : 32px;
-			z-index    : 150;
-			width      : 200px;
-			font-size  : 0.8em;
-			color      : #c9ad6a;
-			text-align : right;
-		}
-		//*****************************
-		// *          EXTRAS
-		// *****************************/
-		hr{
-			visibility : hidden;
-			margin     : 0px;
-		}
-		//Modified unorder list, used in spells
-		hr+ul{
-			margin-bottom   : 0.5em;
-			padding-left    : 1em;
-			text-indent     : -1em;
-			list-style-type : none;
-		}
-		//Column Break
-		pre, code{
-			visibility                 : hidden;
-			-webkit-column-break-after : always;
-			break-after                : always;
-			-moz-column-break-after    : always;
-		}
-		//Avoid breaking up
-		p,blockquote,table{
-			z-index                     : 15;
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
-		//Better spacing for spell blocks
-		h4+p+hr+ul{
-			margin-top : -0.5em
-		}
-		//Text indent right after table
-		table+p{
-			text-indent : 1em;
-		}
-		// Nested lists
-		ul ul,ol ol,ul ol,ol ul{
-			margin-bottom : 0px;
-			margin-left   : 1.5em;
-		}
-		li{
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
 		}
 	}
 	//*****************************
-	// *         SPELL LIST
+	// *            NOTE
 	// *****************************/
-	.phb .spellList{
+	blockquote{
 		.useSansSerif();
-		column-count        : 4;
+		box-sizing          : border-box;
-		column-span         : all;
+		margin-bottom       : 1em;
-		-webkit-column-span : all;
+		padding             : 5px 10px;
-		-moz-column-span    : all;
+		background-color    : @noteGreen;
-		ul+h5{
+		border-style        : solid;
-			margin-top : 15px;
+		border-width        : 11px;
-		}
+		border-image        : @noteBorderImage 11;
+		border-image-outset : 9px 0px;
+		box-shadow          : 1px 4px 14px #888;
 		p, ul{
 			font-size   : 0.352cm;
-			line-height : 1.263em;
+			line-height : 1.083em;
+		}
+	}
+	//If a note starts a column, give it space at the top to render border
+	pre+blockquote, h2+blockquote, h3+blockquote, h4+blockquote, h5+blockquote {
+		margin-top : 13px;
+	}
+	//*****************************
+	// *    MONSTER STAT BLOCK
+	// *****************************/
+	hr+blockquote{
+		position         : relative;
+		padding-top      : 15px;
+		background-color : @monsterStatBackground;
+		border-style     : solid;
+		border-width     : 10px;
+		border-image     : @monsterBorderImageLegacy 10;
+		h2{
+			margin-top    : -8px;
+			margin-bottom : 0px;
+			&+p{
+				padding-bottom : 0px;
+			}
+		}
+		h3{
+			font-family   : ScalySans;
+			font-weight   : 400;
+			border-bottom : 1px solid @headerText;
+		}
+		hr+ul{
+			color : @headerText;
 		}
 		ul{
-			margin-bottom               : 0.5em;
+			.useSansSerif();
-			padding-left                : 1em;
+			padding-left : 1em;
-			text-indent                 : -1em;
+			font-size    : 0.352cm;
-			list-style-type             : none;
-			-webkit-column-break-inside : auto;
-			page-break-inside           : auto;
-			break-inside                : auto;
 		}
-	}
+		// Monster Ability table
-	//*****************************
+		hr+table{
-	// *         WIDE
+			margin              : 0;
-	// *****************************/
+			background-color    : transparent;
-	.phb .wide{
+			border-style        : none;
-		column-span         : all;
+			border-image        : none;
-		-webkit-column-span : all;
+			tbody{
-		-moz-column-span    : all;
+				tr:nth-child(odd), tr:nth-child(even){
-	}
+					background-color : transparent;
-	//*****************************
-	// *       CLASS TABLE
-	// *****************************/
-	.phb .classTable{
-		margin-top          : 25px;
-		margin-bottom       : 40px;
-		border-collapse     : separate;
-		background-color    : white;
-		border              : initial;
-		border-style        : solid;
-		border-image-outset : 25px 17px;
-		border-image-repeat : stretch;
-		border-image-slice  : 150 200 150 200;
-		border-image-source : @frameBorderImage;
-		border-image-width  : 47px;
-		h5{
-			margin-bottom : 10px;
-		}
-	}
-	//************************************
-	// *       DESCRIPTIVE TEXT BOX
-	// ************************************/
-	.phb .descriptive{
-		margin-bottom       : 1em;
-		background-color    : #faf7ea;
-		font-family         : ScalySans;
-		border-style        : solid;
-		border-width        : 7px;
-		border-image        : @descriptiveBoxImage 12 stretch;
-		border-image-outset : 4px;
-		box-shadow          : 0px 0px 6px #faf7ea;
-		p{
-			display        : block;
-			padding-bottom : 0px;
-			line-height    : 1.47em;
-		}
-		p + p {
-			padding-top : .8em;
-		}
-		em {
-			font-family : ScalySans;
-			font-style  : italic;
-		}
-		strong {
-			font-family    : ScalySans;
-			font-weight    : 800;
-			letter-spacing : -0.02em;
-		}
-	}
-	.phb pre+.descriptive{
-		margin-top : 8px;
-	}
-
-	//*****************************
-	// *    ARTIST CREDIT BLOCK
-	// *****************************/
-	.phb {
-		.artist {
-			position    : absolute;
-			text-align  : center;
-			font-family : WalterTurncoat;
-			font-size   : 0.27cm;
-			color       : @captionText;
-			p, p + p {
-				margin      : unset;
-				text-indent : unset;
-				line-height : 0.941em;
-			}
-		 	h5 {
-				font-size   : 1.3em;
-				font-family : WalterTurncoat;
-			}
-			a{
-				color           : inherit;
-				text-decoration : unset;
-				&:hover {
-					text-decoration : underline;
 				}
 			}
 		}
+		table{
+			color : @headerText;
+		}
+		p+p{
+			margin-top     : 0em;
+			padding-bottom : 0.5em;
+			text-indent    : 0em;
+		}
+		//Triangle dividers
+		hr{
+			visibility       : visible;
+			height           : 6px;
+			margin           : 4px 0px;
+			background-image : @redTriangleImage;
+			background-size  : 100% 100%;
+			border           : none;
+		}
+	}
+	//Full Width
+	hr+hr+blockquote{
+		.useColumns(0.96);
 	}
 	//*****************************
-	// *      TABLE OF CONTENTS
+	// *           FOOTER
 	// *****************************/
-	.phb .toc{
+	&:after{
+		content          : "";
+		position         : absolute;
+		bottom           : 0px;
+		left             : 0px;
+		z-index          : 100;
+		height           : 50px;
+		width            : 100%;
+		background-image : @footerAccentImage;
+		background-size  : cover;
+	}
+	&:nth-child(even){
+		&:after{
+			transform : scaleX(-1);
+		}
+		.pageNumber{
+			left : 2px;
+		}
+		.footnote{
+			left       : 80px;
+			text-align : left;
+		}
+	}
+	.pageNumber{
+		position   : absolute;
+		right      : 2px;
+		bottom     : 22px;
+		width      : 50px;
+		font-size  : 0.9em;
+		color      : #c9ad6a;
+		text-align : center;
+		&.auto::after {
+			content : counter(phb-page-numbers);
+		}
+	}
+	.footnote{
+		position   : absolute;
+		right      : 80px;
+		bottom     : 32px;
+		z-index    : 150;
+		width      : 200px;
+		font-size  : 0.8em;
+		color      : #c9ad6a;
+		text-align : right;
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	hr{
+		visibility : hidden;
+		margin     : 0px;
+	}
+	//Modified unorder list, used in spells
+	hr+ul{
+		margin-bottom   : 0.5em;
+		padding-left    : 1em;
+		text-indent     : -1em;
+		list-style-type : none;
+	}
+	//Column Break
+	pre, code{
+		visibility                 : hidden;
+		-webkit-column-break-after : always;
+		break-after                : always;
+		-moz-column-break-after    : always;
+	}
+	//Avoid breaking up
+	p,blockquote,table{
+		z-index                     : 15;
 		-webkit-column-break-inside : avoid;
 		page-break-inside           : avoid;
 		break-inside                : avoid;
+	}
+	//Better spacing for spell blocks
+	h4+p+hr+ul{
+		margin-top : -0.5em
+	}
+	//Text indent right after table
+	table+p{
+		text-indent : 1em;
+	}
+	// Nested lists
+	ul ul,ol ol,ul ol,ol ul{
+		margin-bottom : 0px;
+		margin-left   : 1.5em;
+	}
+	li{
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
+	}
+}
+//*****************************
+// *         SPELL LIST
+// *****************************/
+.phb .spellList{
+	.useSansSerif();
+	column-count        : 4;
+	column-span         : all;
+	-webkit-column-span : all;
+	-moz-column-span    : all;
+	ul+h5{
+		margin-top : 15px;
+	}
+	p, ul{
+		font-size   : 0.352cm;
+		line-height : 1.263em;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
+	}
+}
+//*****************************
+// *         WIDE
+// *****************************/
+.phb .wide{
+	column-span         : all;
+	-webkit-column-span : all;
+	-moz-column-span    : all;
+}
+//*****************************
+// *       CLASS TABLE
+// *****************************/
+.phb .classTable{
+	margin-top          : 25px;
+	margin-bottom       : 40px;
+	border-collapse     : separate;
+	background-color    : white;
+	border              : initial;
+	border-style        : solid;
+	border-image-outset : 25px 17px;
+	border-image-repeat : stretch;
+	border-image-slice  : 150 200 150 200;
+	border-image-source : @frameBorderImage;
+	border-image-width  : 47px;
+	h5{
+		margin-bottom : 10px;
+	}
+}
+//************************************
+// *       DESCRIPTIVE TEXT BOX
+// ************************************/
+.phb .descriptive{
+	margin-bottom       : 1em;
+	background-color    : #faf7ea;
+	font-family         : ScalySans;
+	border-style        : solid;
+	border-width        : 7px;
+	border-image        : @descriptiveBoxImage 12 stretch;
+	border-image-outset : 4px;
+	box-shadow          : 0px 0px 6px #faf7ea;
+	p{
+		display        : block;
+		padding-bottom : 0px;
+		line-height    : 1.47em;
+	}
+	p + p {
+		padding-top : .8em;
+	}
+	em {
+		font-family : ScalySans;
+		font-style  : italic;
+	}
+	strong {
+		font-family    : ScalySans;
+		font-weight    : 800;
+		letter-spacing : -0.02em;
+	}
+}
+.phb pre+.descriptive{
+	margin-top : 8px;
+}
+
+//*****************************
+// *    ARTIST CREDIT BLOCK
+// *****************************/
+.phb {
+	.artist {
+		position    : absolute;
+		text-align  : center;
+		font-family : WalterTurncoat;
+		font-size   : 0.27cm;
+		color       : @captionText;
+		p, p + p {
+			margin      : unset;
+			text-indent : unset;
+			line-height : 0.941em;
+		}
+	 	h5 {
+			font-size   : 1.3em;
+			font-family : WalterTurncoat;
+		}
 		a{
-			color           : black;
+			color           : inherit;
-			text-decoration : none;
+			text-decoration : unset;
-			&:hover{
+			&:hover {
 				text-decoration : underline;
 			}
 		}
-		ul{
+	}
-			padding-left    : 0;
+}
-			list-style-type : none;
+//*****************************
-		}
+// *      TABLE OF CONTENTS
-		&>ul>li{
+// *****************************/
-			margin-bottom : 10px;
+.phb .toc{
-		}
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	a{
+		color           : black;
+		text-decoration : none;
+		&:hover{
+			text-decoration : underline;
+		}
+	}
+	ul{
+		padding-left    : 0;
+		list-style-type : none;
+	}
+	&>ul>li{
+		margin-bottom : 10px;
 	}
 }

themes/V3/5eDMG/style.less

@@ -1,21 +1,19 @@
-@layer V3_5eDMG {
+:root {
-	:root {
+	//Colors
-		//Colors
+	--HB_Color_Accent                : #EBCEC3; // Salmon
-		--HB_Color_Accent                : #EBCEC3; // Salmon
+	--HB_Color_Footnotes             : #5C5C5C; // Dark gray
-		--HB_Color_Footnotes             : #5C5C5C; // Dark gray
+}
+
+.page {
+	background-image : url(/assets/DMG_background.png);
+	background-size  : cover;
+
+	&:after {
+		background-image : url(/assets/DMG_footerAccent.png);
+		height: 58px;
 	}
 
-	.page {
+	.footnote {
-		background-image : url(/assets/DMG_background.png);
+		bottom : 40px;
-		background-size  : cover;
-
-		&:after {
-			background-image : url(/assets/DMG_footerAccent.png);
-			height: 58px;
-		}
-
-		.footnote {
-			bottom : 40px;
-		}
 	}
 }