From 640bc33719ba9443015b94f4f4c9b67563c8e71d Mon Sep 17 00:00:00 2001
From: Charlie Humphreys <ahumphreys3@gmail.com>
Date: Sun, 28 Nov 2021 22:17:02 -0600
Subject: [PATCH 1/5] Fix cover page snippet styles and formatting for v3

---
 .../snippetbar/snippets/coverpage.gen.js      | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
index 7fbdba0fc..ca1b27dd0 100644
--- a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
@@ -100,15 +100,15 @@ const subtitles = [
 
 module.exports = ()=>{
 	return `<style>
-  .phb#p1{ text-align:center; }
-  .phb#p1:after{ display:none; }
-  .phb#p2 { counter-reset:phb-page-numbers; }
-  .phb:nth-child(2n) .pageNumber { left: inherit !important; right: 2px !important; }
-  .phb:nth-child(2n+1) .pageNumber { right: inherit !important; left: 2px !important; }
-  .phb:nth-child(2n)::after { transform: scaleX(1); }
-  .phb:nth-child(2n+1)::after { transform: scaleX(-1); }
-  .phb:nth-child(2n) .footnote { left: inherit; text-align: right; }
-  .phb:nth-child(2n+1) .footnote { left: 80px; text-align: left; }
+  .page#p1{ text-align:center; }
+  .page#p1:after{ display:none; }
+  .page#p2 { counter-reset:phb-page-numbers; }
+  .page:nth-child(2n) .pageNumber { left: inherit !important; right: 2px !important; }
+  .page:nth-child(2n+1) .pageNumber { right: inherit !important; left: 2px !important; }
+  .page:nth-child(2n)::after { transform: scaleX(1); }
+  .page:nth-child(2n+1)::after { transform: scaleX(-1); }
+  .page:nth-child(2n) .footnote { left: inherit; text-align: right; }
+  .page:nth-child(2n+1) .footnote { left: 80px; text-align: left; }
 </style>
 
 <div style='margin-top:450px;'></div>
@@ -116,9 +116,10 @@ module.exports = ()=>{
 # ${_.sample(titles)}
 
 <div style='margin-top:25px'></div>
-<div class='wide'>
+
+{{wide
 ##### ${_.sample(subtitles)}
-</div>
+}}
 
 \\page`;
 };
\ No newline at end of file

From 9e7239cfef48c563e34cb579fb037ea8845796c8 Mon Sep 17 00:00:00 2001
From: Charlie Humphreys <ahumphreys3@gmail.com>
Date: Sun, 28 Nov 2021 22:37:51 -0600
Subject: [PATCH 2/5] Fix table of contents CSS so the first items in both
 columns start at the same vertical position

---
 themes/5ePhb.style.less | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less
index 8991e51e7..0ac35a916 100644
--- a/themes/5ePhb.style.less
+++ b/themes/5ePhb.style.less
@@ -652,7 +652,7 @@ body {
 	break-inside                : avoid;
 	h1 {
 		text-align    : center;
-		margin-bottom : 0cm;
+		margin-bottom : 0.52cm;
 	}
 	a{
 		display         : table;
@@ -668,9 +668,6 @@ body {
 			line-height: 1.2em;
 		}
 	}
-	& > ul {
-		margin-top: 0.52cm;
-	}
 	ul{
 		padding-left    : 0;
 		list-style-type : none;

From 85c221e9bda1fe4a521ffd7e65293169076dadeb Mon Sep 17 00:00:00 2001
From: Charlie Humphreys <ahumphreys3@gmail.com>
Date: Sun, 28 Nov 2021 23:02:44 -0600
Subject: [PATCH 3/5] Change counter usage in cover page snippet to no longer
 increment the counter on the cover page

---
 client/homebrew/editor/snippetbar/snippets/coverpage.gen.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
index ca1b27dd0..67a5be509 100644
--- a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
@@ -100,9 +100,8 @@ const subtitles = [
 
 module.exports = ()=>{
 	return `<style>
-  .page#p1{ text-align:center; }
+  .page#p1{ text-align:center; counter-increment: none; }
   .page#p1:after{ display:none; }
-  .page#p2 { counter-reset:phb-page-numbers; }
   .page:nth-child(2n) .pageNumber { left: inherit !important; right: 2px !important; }
   .page:nth-child(2n+1) .pageNumber { right: inherit !important; left: 2px !important; }
   .page:nth-child(2n)::after { transform: scaleX(1); }

From d4c5ac811064b95d252d5bf6d96d27c69f5eb889 Mon Sep 17 00:00:00 2001
From: Charlie Humphreys <ahumphreys3@gmail.com>
Date: Wed, 15 Dec 2021 20:14:07 -0600
Subject: [PATCH 4/5] Change div syntax in snippet to curly-brace v3 syntax

---
 client/homebrew/editor/snippetbar/snippets/coverpage.gen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
index 67a5be509..0fb8ba7a4 100644
--- a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
+++ b/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
@@ -110,11 +110,11 @@ module.exports = ()=>{
   .page:nth-child(2n+1) .footnote { left: 80px; text-align: left; }
 </style>
 
-<div style='margin-top:450px;'></div>
+{{margin-top:225px}}
 
 # ${_.sample(titles)}
 
-<div style='margin-top:25px'></div>
+{{margin-top:25px}}
 
 {{wide
 ##### ${_.sample(subtitles)}

From cebc74009dc3eef08ced703971efd77f1df9b84c Mon Sep 17 00:00:00 2001
From: Trevor Buckner <calculuschild@gmail.com>
Date: Wed, 15 Dec 2021 21:48:13 -0500
Subject: [PATCH 5/5] Couple more tweaks to spacings in the TOC

---
 themes/5ePhb.style.less | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less
index 34998480e..63af5e972 100644
--- a/themes/5ePhb.style.less
+++ b/themes/5ePhb.style.less
@@ -653,7 +653,7 @@ body {
 	break-inside                : avoid;
 	h1 {
 		text-align    : center;
-		margin-bottom : 0.52cm;
+		margin-bottom : 0.3cm;
 	}
 	a{
 		display         : table;
@@ -664,7 +664,8 @@ body {
 		}
 	}
 	h4 {
-		margin-top : 0.14cm;
+		margin-top  : 0.2cm;
+		line-height : 0.4cm;
 		& + ul li {
 			line-height: 1.2em;
 		}