Geologist: Update header spacing (#4773)

* Geologist: Update header spacing

* Make the margin 30px

* Remove spacing around tagline in geologist

* add missing {

blockbase/assets/ponyfill.css

@@ -832,6 +832,10 @@ div.wp-block-query-pagination .wp-block-query-pagination-numbers .current {
 	width: var(--wp--custom--separator--width);
 }
 
+p.wp-block-site-tagline {
+	margin: 0;
+}
+
 .wp-block-file .wp-block-file__button {
 	border-width: 0;
 	padding-top: calc( var(--wp--custom--button--spacing--padding--top) + var(--wp--custom--button--border--width));

blockbase/sass/blocks/_site-tagline.scss

@@ -0,0 +1,4 @@
+// Needed until we merge https://github.com/WordPress/gutenberg/issues/35323
+p.wp-block-site-tagline {
+	margin: 0
+}

blockbase/sass/ponyfill.scss

@@ -25,6 +25,7 @@
 @import "blocks/quote";
 @import "blocks/search";
 @import "blocks/separator";
+@import "blocks/site-tagline";
 @import "blocks/file";
 @import "blocks/table";
 @import "blocks/video";

blockbase/theme.json

@@ -462,12 +462,6 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700
-				}
-			},
 			"core/quote": {
 				"border": {
 					"color": "var(--wp--custom--color--primary)",
@@ -489,6 +483,12 @@
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontStyle": "normal"
 				}
+			},
+			"core/site-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": 700
+				}
 			}
 		},
 		"color": {

geologist/block-template-parts/header.html

@@ -2,7 +2,7 @@
 <header class="wp-block-group site-header" style="padding-bottom:90px">
 	<!-- wp:site-logo /-->
 	<!-- wp:site-title /-->
-	<!-- wp:site-tagline {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"20px"},"margin":{"right":"auto"}},"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
+	<!-- wp:site-tagline {"style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} /-->
 	<!-- wp:navigation {"isResponsive":true,"__unstableLocation":"primary"} /-->
 </header>
 <!-- /wp:group -->

geologist/child-theme.json

@@ -117,7 +117,8 @@
 				"body": 1.7
 			},
 			"gap": {
-				"horizontal": "min(20px, 5vw)",
+				"baseline": "10px",
+				"horizontal": "min(30px, 5vw)",
 				"vertical": "min(30px, 5vw)"
 			},
 			"paragraph": {

geologist/theme.json

@@ -229,7 +229,7 @@
 			},
 			"gap": {
 				"baseline": "10px",
-				"horizontal": "min(20px, 5vw)",
+				"horizontal": "min(30px, 5vw)",
 				"vertical": "min(30px, 5vw)"
 			},
 			"paragraph": {
@@ -415,6 +415,11 @@
 				}
 			},
 			"core/post-title": {
+				"spacing": {
+					"margin": {
+						"bottom": "0"
+					}
+				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(48px, 7vw), 64px)",
@@ -461,16 +466,6 @@
 					"width": "0 0 1px 0"
 				}
 			},
-			"core/site-title": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700,
-					"textTransform": "uppercase"
-				},
-				"color": {
-					"link": "var(--wp--custom--color--primary)"
-				}
-			},
 			"core/quote": {
 				"border": {
 					"color": "var(--wp--custom--color--primary)",
@@ -495,6 +490,16 @@
 					"lineHeight": "40px"
 				}
 			},
+			"core/site-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"fontWeight": 700,
+					"textTransform": "uppercase"
+				},
+				"color": {
+					"link": "var(--wp--custom--color--primary)"
+				}
+			},
 			"core/navigation-link": {
 				"color": {
 					"background": "transparent",