Merge branch 'master' into addUserInfo-naturalcrit#1908

G-Ambatte · Oct 28, 2022 · 039b363 · 039b363
2 parents b84f083 + a13ac2e
commit 039b363
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 36 deletions.
diff --git a/changelog.md b/changelog.md
@@ -45,6 +45,17 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Thursday 28/10/2022 - v3.3.1
+{{taskList
+
+##### Calculuschild
+
+* [x] Fixes to several broken CSS styles from v3.3.0
+
+Fixes issues  [#2468](https://github.com/naturalcrit/homebrewery/issues/2468)
+
+}}
+
 ### Friday 19/10/2022 - v3.3.0
 {{taskList
 
@@ -76,8 +87,6 @@ Fixes issues  [#2135](https://github.com/naturalcrit/homebrewery/issues/2135)
 Fixes issues  [#2427](https://github.com/naturalcrit/homebrewery/issues/2427)
 
 
-
-
 ##### Gazook:
 
 * [x] Several updates to bug reporting and error popups

diff --git a/client/template.js b/client/template.js
@@ -15,7 +15,7 @@ module.exports = async(name, title = '', props = {})=>{
 		<meta property="og:description" content="${props.brew?.description || 'No description.'}">
 		<meta property="og:site_name" content="The Homebrewery - Make your Homebrew content look legit!">
 		<meta property="og:type" content="article">
-		<meta name="twitter:card" content="summary_large_image">
+		<meta name="twitter:card" content="summary">
 		<title>${title.length ? `${title} - The Homebrewery`: 'The Homebrewery - NaturalCrit'}</title>
 	</head>
 	<body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "express-async-handler": "^1.2.0",
     "express-static-gzip": "2.1.7",
     "fs-extra": "10.1.0",
-    "googleapis": "108.0.0",
+    "googleapis": "108.0.1",
     "js-yaml": "^4.1.0",
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",

diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
@@ -82,7 +82,7 @@ body {
 	// *            BASE
 	// *****************************/
 
-:where(.page){
+.page{
 	p{
 		overflow-wrap : break-word;		//TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
 		display       : block;
@@ -214,6 +214,7 @@ body {
 	table{
 		.useSansSerif();
 		width         : 100%;
+		line-height   : 16px;
 		& + * {
 			margin-top : 0.325cm;
 		}
@@ -224,25 +225,22 @@ body {
 				vertical-align : bottom;
 				//padding        : 0.14em 0.4em;
 				padding     : 0px 1.5px;   // Both of these are temporary, just to force
-				line-height : 16px;        // PDF to render at same height until Chrome 108
+				//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
-          line-height : 16px;        // PDF to render at same height until Chrome 108
+          //line-height : 16px;        // PDF to render at same height until Chrome 108
 				}
 				&:nth-child(odd){
 					background-color : var(--HB_Color_Accent);
 				}
 			}
 		}
 	}
-	div table:has(~table) {			// Divs with side-by-side tables add an extra line
-		margin-bottom: -0.325cm;	// of vertical space at bottom. This works around it.
-	}
 	//*****************************
 	// *            NOTE
 	// *****************************/
@@ -598,7 +596,7 @@ body {
 //*****************************
 // *         SPELL LIST
 // *****************************/
-:where(.page) .spellList{
+.page .spellList{
 	.useSansSerif();
 	column-count        : 2;
 	ul+h5{
@@ -625,7 +623,7 @@ body {
 //*****************************
 // *       CLASS TABLE
 // *****************************/
-:where(.page) .classTable{
+.page .classTable{
 	th[colspan]:not([rowspan]) {
 		white-space : nowrap;
 	}
@@ -682,7 +680,7 @@ body {
 //*****************************
 // *      TABLE OF CONTENTS
 // *****************************/
-:where(.page) {
+.page {
 	&:has(.toc):after {
 		display: none;
 	}
@@ -759,7 +757,7 @@ body {
 //*****************************
 // *    DEFINITION LISTS
 // *****************************/
-:where(.page) {
+.page {
 	dl {
 		line-height  : 1.25em;
 		padding-left : 1em;
@@ -789,10 +787,10 @@ body {
 //*****************************
 // *         WIDE
 // *****************************/
-:where(.page) .wide{
+.page .wide{
 	margin-bottom       : 0.325cm;
 }
 
-:where(.page) h1 + *{
+.page h1 + *{
 	margin-top : 0;
 }
diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
@@ -43,7 +43,7 @@ body {
 	//*****************************
 	// *            BASE
 	// *****************************/
-:where(.page){
+.page{
 	p{
 		overflow-wrap : break-word;
 		display       : block;
@@ -77,13 +77,7 @@ body {
 	img{
 		z-index : -1;
 	}
-	:not(:where(.wide,.columnSplit,.blank,hr,h1)) + :where(h2,h3,h4,h5,h6,table,dl,.block) {
-		margin-top : 0.325cm;  		//NOTE: MAKE ALL MARGINS TOP-ONLY FOR BEST RESULTS WITH COLUMN BREAKS. USE * + * STYLE SELECTORS
-	}
 
-	:is(h1,h3,h3,h4,h5,h6) + * {
-		margin-top : 0;
-	}
 	//*****************************
 	// *           HEADERS
 	// *****************************/
@@ -116,6 +110,9 @@ body {
 			font-weight : bold;
 		}
 	}
+	div:not(.columnWrapper) > table + table {	// Side-by-side tables should not
+		margin-top : 0;	                        // have vertical spacing.
+	}
 
 	/* Watermark */
 	.watermark {
@@ -218,7 +215,7 @@ body {
 //*****************************
 // *    MUSTACHE DIVS/SPANS
 // *****************************/
-:where(.page) {
+.page {
 	.block {
 		break-inside      : avoid;
 		display           : inline-block;
@@ -233,7 +230,7 @@ body {
 //*****************************
 // *    DEFINITION LISTS
 // *****************************/
-:where(.page) {
+.page {
 	dl {
 		padding-left : 1em;
 		white-space  : pre-line;
@@ -253,17 +250,20 @@ body {
 //*****************************
 // *    BLANK LINE
 // *****************************/
-:where(.page) {
+.page {
 	.blank {
 		height     : 1em;
 		margin-top : 0;
+		& + * {
+			margin-top : 0;
+		}
 	}
 }
 
 //*****************************
 // *         WIDE
 // *****************************/
-:where(.page) {
+.page {
 	.wide{
 		column-span         : all;
 		display             : block;

diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less
@@ -62,7 +62,7 @@
 	//*****************************
 	// *            BASE
 	// *****************************/
-:where(.page){
+.page{
 	color       : var(--HB_Color_Text);
 	font-family : ReenieBeanie;
 	font-size   : 0.53cm;
@@ -554,6 +554,6 @@
 //*****************************
 // *         WIDE
 // *****************************/
-:where(.page) .wide {
+.page .wide {
 	margin-bottom       : 0.45cm;
 }