From 047160e4ecaa968419c3319f0b17261bf9bcd3c5 Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Mon, 24 Oct 2022 17:01:38 -0400
Subject: [PATCH] Further tweaks to table size/header spacings

---
 themes/V3/5ePHB/style.less | 48 +++++++++++++++++---------------------
 themes/V3/Blank/style.less |  7 ++++--
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
index 181fec3b2..b6bad7d6d 100644
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -158,9 +158,9 @@ body {
 			padding-bottom          : 2px;
 			margin-bottom           : -20px;
 			background-image        : linear-gradient(-45deg, #322814, #998250, #322814);
-	    background-clip         : text;
-	    -webkit-background-clip : text;
-	    color                   : rgba(0, 0, 0, 0);
+			background-clip         : text;
+			-webkit-background-clip : text;
+			color                   : rgba(0, 0, 0, 0);
 		}
 		&+p::first-line{
 			font-variant : small-caps;
@@ -178,21 +178,25 @@ body {
 		font-size     : 0.575cm;
 		border-bottom : 2px solid var(--HB_Color_HeaderUnderline);;
 		line-height   : 0.995em; //Font is misaligned. Shift up slightly
-		margin-top    : 0.13cm; //(0.3 - 0.17)
 		& + * {
 			margin-top: 0.17cm;
 		}
 	}
+	* + h3 {
+		margin-top    : 0.13cm; //(0.3 - 0.17)
+	}
 	h4{
 		//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
 		//margin-bottom : 0.02cm;
 		font-size     : 0.458cm;
 		line-height   : 0.971em; //Font is misaligned. Shift up slightly
-		margin-top    : 0.21cm; //(0.3 - 0.09)
 		& + * {
 			margin-top: 0.09cm;
 		}
 	}
+	* + h4 {
+		margin-top    : 0.21cm; //(0.3 - 0.09)
+	}
 	h5{
 		//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
 		//margin-bottom : 0.02cm;
@@ -207,6 +211,9 @@ body {
 	//*****************************
 	// *          TABLE
 	// *****************************/
+	div:has(table) {
+		display:block; // Inline-block divs tend to add ~5px when containing tables. Block Divs are fine (but don't work for everything else)
+	}
 	table{
 		.useSansSerif();
 		width         : 100%;
@@ -219,16 +226,16 @@ body {
 			th{
 				vertical-align : bottom;
 				//padding        : 0.14em 0.4em;
-				padding : 0px 1.5px;   // Both of these are temporary, just to force
-				//height  : 16px;        // PDF to render at same height until Chrome 108
+				padding     : 0px 1.5px;   // Both of these are temporary, just to force
+				line-height : 16px;        // PDF to render at same height until Chrome 108
 			}
 		}
 		tbody{
 			tr{
 				td{
 					//padding : 0.14em 0.4em;
-					padding : 0px 1.5px;   // Both of these are temporary, just to force
-          //height  : 16px;        // PDF to render at same height until Chrome 108
+					padding     : 0px 1.5px;   // Both of these are temporary, just to force
+          line-height : 16px;        // PDF to render at same height until Chrome 108
 				}
 				&:nth-child(odd){
 					background-color : var(--HB_Color_Accent);
@@ -779,26 +786,13 @@ body {
   }
 }
 
-//*****************************
-// *    BLANK LINE
-// *****************************/
-:where(.page) {
-	.blank {
-		height     : 1em;
-		margin-top : 0;
-	}
-}
-
 //*****************************
 // *         WIDE
 // *****************************/
 :where(.page) .wide{
-	column-span         : all;
-	-webkit-column-span : all;
-	-moz-column-span    : all;
-	display             : block;
-	margin-bottom       : 0.34cm;
-	&+* {
-		margin-top : 0;
-	}
+	margin-bottom       : 0.3cm;
+}
+
+:where(.page) h1 + *{
+	margin-top : 0;
 }
diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index 0a2c86321..aa5f6fcca 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -77,11 +77,11 @@ body {
 	img{
 		z-index : -1;
 	}
-	:not(:where(.wide,.columnSplit,.blank,hr)) + :where(h1,h2,h3,h4,h5,h6,table,dl,.block) {
+	:not(:where(.wide,.columnSplit,.blank,hr,h1)) + :where(h2,h3,h4,h5,h6,table,dl,.block) {
 		margin-top : 0.3cm;  		//NOTE: MAKE ALL MARGINS TOP-ONLY FOR BEST RESULTS WITH COLUMN BREAKS. USE * + * STYLE SELECTORS
 	}
 
-	:where(h1,h3,h3,h4,h5,h6) + * {
+	:is(h1,h3,h3,h4,h5,h6) + * {
 		margin-top : 0;
 	}
 	//*****************************
@@ -192,6 +192,9 @@ body {
 		break-after                : always;
 		-moz-column-break-after    : always;
 		margin-top                 : 0;
+		& + * {
+			margin-top : 0;
+		}
 	}
 	//Avoid breaking up
 	blockquote,table{