From a38399552251becfd6c318ad831d1eec759e4fff Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Sat, 27 Aug 2022 21:20:35 -0400
Subject: [PATCH] Cleaning up some redundant styles in Journal Theme

---
 themes/V3/Blank/style.less   | 26 +++++++++++++-------
 themes/V3/Journal/style.less | 47 ++++++++----------------------------
 2 files changed, 27 insertions(+), 46 deletions(-)

diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index d93ce1e41..668be712e 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -18,8 +18,6 @@ body {
 .useColumns(@multiplier : 1, @fillMode: balance){
 	column-fill          : @fillMode;
 	column-count         : 2;
-	column-gap           : 0.9cm;
-	column-width         : 8cm * @multiplier;
 }
 .columnWrapper{
 	max-height        : 100%;
@@ -29,15 +27,15 @@ body {
 }
 .page{
 	.useColumns();
+	height            : 279.4mm;
+	width             : 215.9mm;
+	padding           : 1.4cm 1.9cm 1.7cm;
 	counter-increment : phb-page-numbers;
+	background-color  : var(--HB_Color_Background);
 	position          : relative;
 	z-index           : 15;
 	box-sizing        : border-box;
 	overflow          : hidden;
-	height            : 279.4mm;
-	width             : 215.9mm;
-	background-color  : var(--HB_Color_Background);
-	padding           : 1.4cm 1.9cm 1.7cm;
 	text-rendering    : optimizeLegibility;
 	page-break-before : always;
 	page-break-after  : always;
@@ -51,7 +49,7 @@ body {
 		display       : block;
 	}
 	strong{
-		font-weight    : bold;
+		font-weight : bold;
 	}
 	em{
 		font-style : italic;
@@ -66,6 +64,16 @@ body {
 		font-size      : smaller;
 		line-height    : 0;
 	}
+	ul {
+		list-style-position : outside; //Needed for multiline list items
+		list-style-type     : disc;
+		padding-left        : 1.4em;
+	}
+	ol {
+		list-style-position : outside;
+		list-style-type     : decimal;
+		padding-left        : 1.4em;
+	}
 	img{
 		z-index : -1;
 	}
@@ -102,9 +110,9 @@ body {
 	// *          TABLE
 	// *****************************/
 	table{
-		width         : 100%;
+		width : 100%;
 		thead{
-			display: table-row-group;
+			display     : table-row-group;
 			font-weight : bold;
 		}
 	}
diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less
index 7f4fe53c0..359c32e2f 100644
--- a/themes/V3/Journal/style.less
+++ b/themes/V3/Journal/style.less
@@ -16,13 +16,6 @@
 	--HB_Color_Footnotes             : #C9AD6A; // Gold
 }
 
-@page { margin: 0; }
-body {
-	counter-reset : phb-page-numbers;
-}
-*{
-	-webkit-print-color-adjust : exact;
-}
 .useSansSerif(){
 	font-family : PermanentMarker;
 	font-size   : 0.3cm;
@@ -46,15 +39,10 @@ body {
 	}
 }
 .useColumns(@multiplier : 1, @fillMode: balance){
-	column-count         : 2;
-	column-fill          : @fillMode;
 	column-gap           : 0.5cm;
-	column-width         : unset;
 }
 
 .page{
-	.useColumns();
-	background-color    : var(--HB_Color_Background);
 	background-size     : 200% 100%;
 	background-repeat   : no-repeat;
 	filter              : drop-shadow(1px 4px 14px black);
@@ -76,7 +64,6 @@ body {
 	}
 }
 
-
 	//*****************************
 	// *            BASE
 	// *****************************/
@@ -85,31 +72,17 @@ body {
 	font-family : ReenieBeanie;
 	font-size   : 0.53cm;
 	line-height : 0.8em;
-	p{
-		overflow-wrap : break-word;		//TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
-		display       : block;
-		&+* {
-			margin-top : 0.325cm;
-		}
-		&+p{
-			margin-top : 0;
-		}
+	p + * {
+		margin-top : 0.325cm;
+	}
+	p + p{
+		margin-top : 0;
 	}
 	ul{
 		margin-bottom       : 0.8em;
-		padding-left        : 1.4em;
-		list-style-position : outside;
-		list-style-type     : disc;
 	}
 	ol{
 		margin-bottom       : 0.8em;
-		padding-left        : 1.4em;
-		list-style-position : outside;
-		list-style-type     : decimal;
-	}
-	//Indents after p or lists
-	p+p, ul+p, ol+p{
-		text-indent : 1em;
 	}
 	em{
 		text-decoration : underline;
@@ -118,6 +91,11 @@ body {
 	del{
 		text-decoration-style: double;
 	}
+
+	//Indents after p or lists
+	p+p, ul+p, ol+p{
+		text-indent : 1em;
+	}
 	//*****************************
 	// *           HEADERS
 	// *****************************/
@@ -185,7 +163,6 @@ body {
 	// *****************************/
 	table{
 		.useSansSerif();
-		width         : 100%;
 		& + * {
 			margin-top : 0.325cm;
 		}
@@ -434,13 +411,9 @@ body {
 		vertical-align   : middle;
 		background-color : #faf7ea;
 		border-radius    : 4px;
-		white-space      : pre-wrap;
-		overflow-wrap    : break-word;
 	}
 
 	pre code{
-		width               : 100%;
-		display             : inline-block;
 		border-style        : solid;
 		border-width        : 1px;
 		border-image        : @codeBorderImage 26 stretch;