Merge branch 'trunk' into add/skatepark-testimonial-block-pattern

# Conflicts:
#	skatepark/assets/theme.css
#	skatepark/inc/block-patterns.php
#	skatepark/sass/theme.scss

blockbase/404.php

@@ -5,20 +5,14 @@
  * @package Blockbase
  * @since 1.1.1
  */
-wp_head();
-
-echo gutenberg_block_template_part( 'header' );
+get_header();
 ?>
+	<main class="container-404">
+		<h1 class="has-text-align-center has-large-font-size"><?php _e( 'Oops! That page can&rsquo;t be found.', 'blockbase' ); ?></h1>
 
-<main class="container-404">
-	<h1 class="has-text-align-center has-large-font-size"><?php _e( 'Oops! That page can&rsquo;t be found.', 'blockbase' ); ?></h1>
-
-	<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'blockbase' ); ?></p>
-
-	<?php echo do_blocks('<!-- wp:search {"label":""} /-->'); ?>
-</main>
+		<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'blockbase' ); ?></p>
 
+		<?php echo do_blocks('<!-- wp:search {"label":""} /-->'); ?>
+	</main>
 <?php
-echo gutenberg_block_template_part( 'footer' );
-
-wp_footer();
+get_footer();

blockbase/assets/ponyfill.css

@@ -201,7 +201,7 @@ textarea {
 	border-radius: var(--wp--custom--form--border--radius);
 	box-shadow: var(--wp--custom--form--color--box-shadow);
 	color: var(--wp--custom--form--color--text);
-	font-family: var(--wp--custom--body--typography--font-family);
+	font-family: inherit;
 	padding: var(--wp--custom--form--padding);
 }
 
@@ -255,7 +255,7 @@ input[type=checkbox] + label {
 	padding-left: calc( var(--wp--custom--button--spacing--padding--left) + var(--wp--custom--button--border--width));
 	padding-right: calc( var(--wp--custom--button--spacing--padding--right) + var(--wp--custom--button--border--width));
 	font-weight: var(--wp--custom--button--typography--font-weight);
-	font-family: var(--wp--custom--button--typography--font-family);
+	font-family: inherit;
 	font-size: var(--wp--custom--button--typography--font-size);
 	line-height: var(--wp--custom--button--typography--line-height);
 	text-decoration: none;
@@ -392,7 +392,6 @@ p.has-text-color a {
 
 p.has-drop-cap:not(:focus):first-letter {
 	font-size: var(--wp--custom--paragraph--dropcap--typography--font-size);
-	font-family: var(--wp--custom--paragraph--dropcap--typography--font-family);
 	font-weight: var(--wp--custom--paragraph--dropcap--typography--font-weight);
 	margin: var(--wp--custom--paragraph--dropcap--margin);
 }
@@ -417,7 +416,7 @@ p.has-background {
 	padding-left: calc( var(--wp--custom--button--spacing--padding--left) + var(--wp--custom--button--border--width));
 	padding-right: calc( var(--wp--custom--button--spacing--padding--right) + var(--wp--custom--button--border--width));
 	font-weight: var(--wp--custom--button--typography--font-weight);
-	font-family: var(--wp--custom--button--typography--font-family);
+	font-family: inherit;
 	font-size: var(--wp--custom--button--typography--font-size);
 	line-height: var(--wp--custom--button--typography--line-height);
 	text-decoration: none;
@@ -454,21 +453,108 @@ p.has-background {
 	fill: var(--wp--custom--button--color--text);
 }
 
+.wp-block-post-comments .reply {
+	margin-block: var(--wp--custom--margin--vertical);
+}
+
 .wp-block-post-comments .reply a {
 	display: inline-block;
 }
 
-.wp-block-post-comments .comment-form input[type="text"] {
+.wp-block-post-comments form {
+	display: grid;
+	column-gap: 1em;
+	grid-template-rows: auto;
+	grid-template-areas: "notes notes" "comment comment" "author author" "email email" "url url" "cookies-consent cookies-consent" "form-submit form-submit";
+}
+
+.wp-block-post-comments form input:not([type=submit]):not([type=checkbox]),
+.wp-block-post-comments form textarea {
+	background: var(--wp--custom--color--background);
+	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
 	width: 100%;
 }
 
-.wp-block-post-comments .comment-reply-title small {
-	float: right;
-	font-size: 14px;
+.wp-block-post-comments form p {
+	margin-top: 0;
+}
+
+.wp-block-post-comments form .comment-notes {
+	grid-area: notes;
+}
+
+.wp-block-post-comments form .comment-form-author {
+	grid-area: author;
+}
+
+.wp-block-post-comments form .comment-form-email {
+	grid-area: email;
+}
+
+.wp-block-post-comments form .comment-form-url {
+	grid-area: url;
+}
+
+.wp-block-post-comments form .comment-form-comment {
+	grid-area: comment;
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent {
+	grid-area: cookies-consent;
+}
+
+.wp-block-post-comments form .form-submit {
+	grid-area: form-submit;
 }
 
-.wp-block-post-comments .comment-form-cookies-consent input[type="checkbox"] {
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] {
+	border: 0;
+	clip: rect(1px, 1px, 1px, 1px);
+	clip-path: inset(50%);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+	word-wrap: normal !important;
+	margin-left: 0;
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + label {
 	margin-left: 0;
+	padding-left: 3em;
+	position: relative;
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + label::before,
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + label::after {
+	box-sizing: border-box;
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + ::before {
+	content: var(--wp--custom--form--checkbox--unchecked--content);
+	position: absolute;
+	top: var(--wp--custom--form--checkbox--unchecked--position--top);
+	left: var(--wp--custom--form--checkbox--unchecked--position--left);
+	width: var(--wp--custom--form--checkbox--unchecked--sizing--width);
+	height: var(--wp--custom--form--checkbox--unchecked--sizing--height);
+	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"]:checked + ::after {
+	content: var(--wp--custom--form--checkbox--checked--content);
+	position: absolute;
+	top: var(--wp--custom--form--checkbox--checked--position--top);
+	left: var(--wp--custom--form--checkbox--checked--position--left);
+	width: var(--wp--custom--form--checkbox--checked--sizing--width);
+	height: var(--wp--custom--form--checkbox--checked--sizing--height);
+	font-size: var(--wp--custom--form--checkbox--checked--font-size);
+}
+
+.wp-block-post-comments .comment-reply-title small {
+	float: right;
+	font-size: 14px;
 }
 
 .wp-block-post-comments .commentlist .comment p {
@@ -476,6 +562,16 @@ p.has-background {
 	line-height: var(--wp--custom--post-comment--typography--line-height);
 }
 
+.wp-block-post-comments .commentmetadata {
+	margin-left: 0;
+}
+
+.wp-block-post-comments .comment-awaiting-moderation {
+	display: inline-block;
+	font-size: var(--wp--preset--font-size--small);
+	margin-bottom: var(--wp--custom--margin--baseline);
+}
+
 .wp-block-pullquote.is-style-solid-color,
 .wp-block-pullquote {
 	text-align: var(--wp--custom--pullquote--typography--text-align);
@@ -501,7 +597,6 @@ p.has-background {
 .wp-block-pullquote blockquote cite {
 	display: block;
 	font-size: var(--wp--custom--pullquote--citation--typography--font-size);
-	font-family: var(--wp--custom--pullquote--citation--typography--font-family);
 	font-style: var(--wp--custom--pullquote--citation--typography--font-style);
 	font-weight: var(--wp--custom--pullquote--citation--typography--font-weight);
 	margin-top: var(--wp--custom--pullquote--citation--spacing--margin--top);
@@ -595,7 +690,7 @@ p.has-background {
 	padding-left: calc( var(--wp--custom--button--spacing--padding--left) + var(--wp--custom--button--border--width));
 	padding-right: calc( var(--wp--custom--button--spacing--padding--right) + var(--wp--custom--button--border--width));
 	font-weight: var(--wp--custom--button--typography--font-weight);
-	font-family: var(--wp--custom--button--typography--font-family);
+	font-family: inherit;
 	font-size: var(--wp--custom--button--typography--font-size);
 	line-height: var(--wp--custom--button--typography--line-height);
 	text-decoration: none;
@@ -653,7 +748,7 @@ p.has-background {
 	padding-left: calc( var(--wp--custom--button--spacing--padding--left) + var(--wp--custom--button--border--width));
 	padding-right: calc( var(--wp--custom--button--spacing--padding--right) + var(--wp--custom--button--border--width));
 	font-weight: var(--wp--custom--button--typography--font-weight);
-	font-family: var(--wp--custom--button--typography--font-family);
+	font-family: inherit;
 	font-size: var(--wp--custom--button--typography--font-size);
 	line-height: var(--wp--custom--button--typography--line-height);
 	text-decoration: none;

blockbase/footer.php

@@ -0,0 +1,11 @@
+<footer class="wp-block-template-part site-footer-container">
+		<?php
+			echo gutenberg_block_template_part( 'footer' );
+		?>
+	</div>
+</footer>
+
+<?php wp_footer(); ?>
+
+</body>
+</html>

blockbase/functions.php

@@ -78,16 +78,27 @@ function blockbase_fonts_url() {
 	}
 
 	$theme_data = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_settings();
-	if ( empty( $theme_data ) || empty( $theme_data['custom'] ) ) {
+	if ( empty( $theme_data ) || empty( $theme_data['typography'] ) || empty( $theme_data['typography']['fontFamilies'] ) ) {
 		return '';
 	}
 
-	$custom_data = $theme_data['custom'];
-	if ( ! array_key_exists( 'fontsToLoadFromGoogle', $custom_data ) ) {
-		return '';
+	$font_families = [];
+	if ( ! empty( $theme_data['typography']['fontFamilies']['theme'] ) ) {
+		foreach( $theme_data['typography']['fontFamilies']['theme'] as $font ) {
+			if ( ! empty( $font['google'] ) ) {
+				$font_families[] = $font['google'];
+			}
+		}
+	}
+
+	if ( ! empty( $theme_data['typography']['fontFamilies']['user'] ) ) {
+		foreach( $theme_data['typography']['fontFamilies']['user'] as $font ) {
+			if ( ! empty( $font['google'] ) ) {
+				$font_families[] = $font['google'];
+			}
+		}
 	}
 
-	$font_families   = $theme_data['custom']['fontsToLoadFromGoogle'];
 	$font_families[] = 'display=swap';
 
 	// Make a single request for the theme fonts.

blockbase/header.php

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html <?php language_attributes(); ?>>
+<head>
+	<meta charset="<?php bloginfo( 'charset' ); ?>" />
+	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<link rel="profile" href="https://gmpg.org/xfn/11" />
+	<?php wp_head(); ?>
+</head>
+
+<body <?php body_class(); ?>>
+<?php wp_body_open(); ?>
+
+	<div class="wp-site-blocks">
+		<header class="wp-block-template-part">
+			<?php
+				echo gutenberg_block_template_part( 'header' );
+			?>
+		</header>

blockbase/inc/customizer/wp-customize-fonts-preview.js

@@ -13,10 +13,13 @@ if ( fontSettings ) {
 }
 
 function blockBaseUpdateFontPreview() {
-	// Build the new CSS variables.
-	let innerHTML = ':root,body{';
-	innerHTML += `--wp--custom--body--typography--font-family:${ fontSettings[ 'body' ] };`;
-	innerHTML += `--wp--custom--heading--typography--font-family:${ fontSettings[ 'heading' ] };`;
+	// Build the new body CSS
+	let innerHTML = 'body{';
+	innerHTML += `font-family:${ fontSettings[ 'body' ] };`;
+	innerHTML += '}';
+	// Build the new heading CSS
+	innerHTML += 'h1,h2,h3,h4,h5,h6,.wp-block-post-title,.wp-block-pullquote{';
+	innerHTML += `font-family:${ fontSettings[ 'heading' ] };`;
 	innerHTML += '}';
 
 	// Inject them into the body.

blockbase/inc/customizer/wp-customize-fonts.php

@@ -232,9 +232,11 @@ class GlobalStylesFontsCustomizer {
 
 	function create_customization_style_element( $wp_customize ) {
 		wp_enqueue_style( 'global-styles-fonts-customizations', ' ', array( 'global-styles' ) ); // This needs to load after global_styles, hence the dependency
-		$css  = ':root,body{';
-		$css .= '--wp--custom--body--typography--font-family:' . $this->font_settings['body'] . ';';
-		$css .= '--wp--custom--heading--typography--font-family: ' . $this->font_settings['heading'] . '}';
+		$css  = 'body{';
+		$css .= 'font-family:' . $this->font_settings['body'] . ';';
+		$css .= '}';
+		$css .= 'h1,h2,h3,h4,h5,h6,.wp-block-post-title,.wp-block-pullquote{';
+		$css .= 'font-family:' . $this->font_settings['heading'] . ';';
 		$css .= '}';
 		wp_add_inline_style( 'global-styles-fonts-customizations', $css );
 	}
@@ -267,16 +269,15 @@ class GlobalStylesFontsCustomizer {
 	}
 
 	function initialize( $wp_customize ) {
-
 		$theme       = wp_get_theme();
 		$merged_json = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_raw_data();
 		$theme_json  = WP_Theme_JSON_Resolver_Gutenberg::get_theme_data()->get_raw_data();
 
-		$body_font_default    = $this->get_font_family( 'body', $theme_json );
-		$heading_font_default = $this->get_font_family( 'heading', $theme_json );
+		$body_font_default    = $this->get_font_family( array( 'styles', 'typography', 'fontFamily' ), $theme_json );
+		$heading_font_default = $this->get_font_family( array( 'styles', 'elements', 'h1', 'typography', 'fontFamily' ), $theme_json );
 
-		$body_font_selected    = $this->get_font_family( 'body', $merged_json );
-		$heading_font_selected = $this->get_font_family( 'heading', $merged_json );
+		$body_font_selected    = $this->get_font_family( array( 'styles', 'typography', 'fontFamily' ), $merged_json );
+		$heading_font_selected = $this->get_font_family( array( 'styles', 'elements', 'h1', 'typography', 'fontFamily' ), $merged_json );
 
 		$this->font_settings = array(
 			'body'    => $body_font_selected['fontFamily'],
@@ -313,8 +314,8 @@ class GlobalStylesFontsCustomizer {
 		$this->add_setting_and_control( $wp_customize, 'heading', __( 'Heading font', 'blockbase' ), $heading_font_default['slug'], $heading_font_selected['slug'] );
 	}
 
-	function get_font_family( $location, $configuration ) {
-		$variable = $configuration['settings']['custom'][ $location ]['typography']['fontFamily'];
+	function get_font_family( $array, $configuration ) {
+		$variable = get_settings_array( $array, $configuration );
 		$slug     = preg_replace( '/var\(--wp--preset--font-family--(.*)\)/', '$1', $variable );
 		if ( ! isset( $this->fonts[ $slug ] ) ) {
 			$this->fonts[ $slug ] = $this->build_font_from_theme_data( $slug, $location, $configuration );
@@ -432,33 +433,79 @@ class GlobalStylesFontsCustomizer {
 			$font_families
 		);
 
-		// Set the custom body settings.
+		// Set the body typography settings.
 		$user_theme_json_post_content = set_settings_array(
 			$user_theme_json_post_content,
-			array( 'settings', 'custom', 'body', 'typography', 'fontFamily' ),
+			array( 'styles', 'typography', 'fontFamily' ),
 			$body_font_family_variable
 		);
 
-		// Set the custom heading settings.
 		$user_theme_json_post_content = set_settings_array(
 			$user_theme_json_post_content,
-			array( 'settings', 'custom', 'heading', 'typography', 'fontFamily' ),
+			array( 'styles', 'blocks', 'core/button', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		// Set the heading typography settings.
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'elements', 'h1', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'elements', 'h2', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'elements', 'h3', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'elements', 'h4', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'elements', 'h5', 'typography', 'fontFamily' ),
 			$heading_font_family_variable
 		);
 
-		// Set the custom google fonts settings.
 		$user_theme_json_post_content = set_settings_array(
 			$user_theme_json_post_content,
-			array( 'settings', 'custom', 'fontsToLoadFromGoogle' ),
-			$google_font_array
+			array( 'styles', 'elements', 'h6', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'blocks', 'core/post-title', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
+		);
+
+		$user_theme_json_post_content = set_settings_array(
+			$user_theme_json_post_content,
+			array( 'styles', 'blocks', 'core/pullquote', 'typography', 'fontFamily' ),
+			$heading_font_family_variable
 		);
 
 		//If the typeface choices === the default then we remove it instead
 		if ( $body_value === $body_default && $heading_value === $heading_default ) {
-			unset( $user_theme_json_post_content->settings->typography->fontFamilies );
-			unset( $user_theme_json_post_content->settings->custom->body->typography->fontFamily );
-			unset( $user_theme_json_post_content->settings->custom->heading->typography->fontFamily );
-			unset( $user_theme_json_post_content->settings->custom->fontsToLoadFromGoogle );
+			unset( $user_theme_json_post_content->styles->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->blocks->{'core/button'}->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h1->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h2->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h3->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h4->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h5->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->elemenets->h6->typography->fontFamilies );
+			unset( $user_theme_json_post_content->styles->blocks->{'core/post-title'}->typography->fontFamilies );
 		}
 
 		// Update the theme.json with the new settings.

blockbase/inc/customizer/wp-customize-utils.php

@@ -23,3 +23,20 @@ function set_settings_array( $target, $array, $value ) {
 	$current->{ $key } = $value;
 	return $target;
 }
+
+/**
+ *
+ * Get a value from an object at the given location.
+ *
+ * @param   array   $array  The array describing the location of the property to update.
+ * @param   object  $object The object.
+ * @return  object          The value at the location.
+ *
+ */
+function get_settings_array( $array, $object ) {
+	foreach( $array as $property ) {
+		$object = $object[ $property ];
+	}
+
+	return $object;
+}

blockbase/sass/base/_style.scss

@@ -3,6 +3,7 @@
  * - Reset the browser
  */
 
+@import "mixins";
 @import "normalize";
 @import "breakpoints";
 

blockbase/sass/blocks/_button-mixins.scss

@@ -28,7 +28,7 @@
 
 @mixin button-typography-styles {
 	font-weight: var(--wp--custom--button--typography--font-weight);
-	font-family: var(--wp--custom--button--typography--font-family);
+	font-family: inherit;
 	font-size: var(--wp--custom--button--typography--font-size);
 	line-height: var(--wp--custom--button--typography--line-height);
 	text-decoration: none; // Needed because link styles inside .entry-content add a text decoration
@@ -61,4 +61,4 @@
 			border-color: var(--wp--custom--button--border--color);
 		}
 	}
-}
+}

blockbase/sass/blocks/_paragraph.scss

@@ -8,7 +8,6 @@ p {
 
 	&.has-drop-cap:not(:focus):first-letter {
 		font-size: var(--wp--custom--paragraph--dropcap--typography--font-size);
-		font-family: var(--wp--custom--paragraph--dropcap--typography--font-family);
 		font-weight: var(--wp--custom--paragraph--dropcap--typography--font-weight);
 		margin: var(--wp--custom--paragraph--dropcap--margin);
 	}

blockbase/sass/blocks/_post-comments.scss

@@ -1,7 +1,6 @@
 @import 'button-mixins';
 
 .wp-block-post-comments {
-
 	label, .comment-meta {
 		font-size: var(--wp--custom--form--label--typography--font-size);
 	}
@@ -12,14 +11,99 @@
 		@include button-hover-styles;
 	}
 
-	.reply a {
-		display: inline-block;
+	.reply {
+		margin-block: var(--wp--custom--margin--vertical);
+
+		a {
+			display: inline-block;
+		}
 	}
 
-	.comment-form {
-		input[type="text"] {
+	form {
+		display: grid;
+		column-gap: 1em;
+		grid-template-rows: auto;
+		grid-template-areas:
+			"notes notes"
+			"comment comment"
+			"author author"
+			"email email"
+			"url url"
+			"cookies-consent cookies-consent"
+			"form-submit form-submit";
+
+		input:not([type=submit]):not([type=checkbox]),
+		textarea {
+			background: var(--wp--custom--color--background);
+			border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
 			width: 100%;
 		}
+
+		p {
+			margin-top: 0;
+		}
+
+		.comment-notes {
+			grid-area: notes;
+		}
+
+		.comment-form-author {
+			grid-area: author;
+		}
+
+		.comment-form-email {
+			grid-area: email;
+		}
+
+		.comment-form-url {
+			grid-area: url;
+		}
+
+		.comment-form-comment {
+			grid-area: comment;
+		}
+
+		.comment-form-cookies-consent {
+			grid-area: cookies-consent;
+		}
+
+		.form-submit {
+			grid-area: form-submit;
+		}
+
+		.comment-form-cookies-consent {
+			input[type="checkbox"] {
+				@include hide-accesibly;
+				margin-left: 0;
+				& + label {
+					margin-left: 0;
+					padding-left: 3em;
+					position: relative;
+				}
+				& + label::before,
+				& + label::after {
+					box-sizing: border-box;
+				}
+				& + ::before {
+					content: var(--wp--custom--form--checkbox--unchecked--content);
+					position: absolute;
+					top: var(--wp--custom--form--checkbox--unchecked--position--top);
+					left: var(--wp--custom--form--checkbox--unchecked--position--left);
+					width: var(--wp--custom--form--checkbox--unchecked--sizing--width);
+					height: var(--wp--custom--form--checkbox--unchecked--sizing--height);
+					border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
+				}
+				&:checked + ::after {
+					content: var(--wp--custom--form--checkbox--checked--content);;
+					position: absolute;
+					top: var(--wp--custom--form--checkbox--checked--position--top);
+					left: var(--wp--custom--form--checkbox--checked--position--left);
+					width: var(--wp--custom--form--checkbox--checked--sizing--width);
+					height: var(--wp--custom--form--checkbox--checked--sizing--height);
+					font-size: var(--wp--custom--form--checkbox--checked--font-size);
+				}
+			}
+		}
 	}
 
 	.comment-reply-title {
@@ -29,12 +113,6 @@
 		}
 	}
 
-	.comment-form-cookies-consent {
-		input[type="checkbox"]{
-			margin-left: 0;
-		}
-	}
-
 	.commentlist {
 		.comment {
 			p {
@@ -44,4 +122,14 @@
 		}
 	}
 
+	.commentmetadata {
+		margin-left: 0;
+	}
+
+	.comment-awaiting-moderation {
+		display: inline-block;
+		font-size: var(--wp--preset--font-size--small);
+		margin-bottom: var(--wp--custom--margin--baseline);
+	}
+
 }

blockbase/sass/blocks/_pullquote.scss

@@ -15,7 +15,6 @@
 		cite {
 			display: block;
 			font-size: var(--wp--custom--pullquote--citation--typography--font-size);
-			font-family: var(--wp--custom--pullquote--citation--typography--font-family);
 			font-style: var(--wp--custom--pullquote--citation--typography--font-style);
 			font-weight: var(--wp--custom--pullquote--citation--typography--font-weight);
 			margin-top: var(--wp--custom--pullquote--citation--spacing--margin--top);
@@ -27,4 +26,3 @@
 		color: var(--wp--custom--color--background);
 	}
 }
-

blockbase/sass/elements/_forms.scss

@@ -20,7 +20,7 @@ textarea {
 	border-radius: var(--wp--custom--form--border--radius);
 	box-shadow: var(--wp--custom--form--color--box-shadow);
 	color: var(--wp--custom--form--color--text);
-	font-family: var(--wp--custom--body--typography--font-family);
+	font-family: inherit;
 	padding: var(--wp--custom--form--padding);
 
 	&:focus {

blockbase/theme.json

@@ -98,7 +98,6 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "normal",
 					"lineHeight": 2
@@ -159,6 +158,31 @@
 					"style": "solid",
 					"width": "2px"
 				},
+				"checkbox": {
+					"checked": {
+						"content": "\"\\2715\"",
+						"fontSize": "14px",
+						"position": {
+							"left": "3px",
+							"top": "4px"
+						},
+						"sizing": {
+							"height": "12px",
+							"width": "12px"
+						}
+					},
+					"unchecked": {
+						"content": "\"\"",
+						"position": {
+							"left": "0",
+							"top": "0.2em"
+						},
+						"sizing": {
+							"height": "16px",
+							"width": "16px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent",
 					"boxShadow": "none",
@@ -180,13 +204,11 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"lineHeight": 1.6
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": 400,
 					"lineHeight": 1.125
 				}
@@ -217,7 +239,6 @@
 				"dropcap": {
 					"margin": ".1em .1em 0 0",
 					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
 						"fontSize": "110px",
 						"fontWeight": "400"
 					}
@@ -295,6 +316,7 @@
 		"spacing": {
 			"customPadding": true,
 			"units": [
+				"%",
 				"px",
 				"em",
 				"rem",
@@ -352,7 +374,7 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)"
@@ -381,7 +403,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
@@ -453,7 +475,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "48px"
@@ -461,7 +483,7 @@
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "32px"
@@ -469,7 +491,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
@@ -477,7 +499,7 @@
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
@@ -485,7 +507,7 @@
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -493,7 +515,7 @@
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -507,7 +529,7 @@
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--custom--body--typography--font-family)",
+			"fontFamily": "var(--wp--preset--font-family--system-font)",
 			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}

mayland-blocks/child-theme.json

@@ -78,20 +78,6 @@
 				"background": "var(--wp--preset--color--background)",
 				"selection": "var(--wp--preset--color--selection)"
 			},
-			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,400;0,600;1,400"
-			],
-			"body": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)"
-				}
-			},
-			"heading": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": 600
-				}
-			},
 			"margin": {
 				"horizontal": "32px"
 			},
@@ -104,10 +90,6 @@
 			"contentSize": "782px",
 			"wideSize": "1000px"
 		},
-		"spacing": {
-			"customPadding": true,
-			"units": [ "px", "em", "rem", "vh", "vw" ]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -115,7 +97,8 @@
 				{
 					"fontFamily": "\"Poppins\", sans-serif",
 					"slug": "poppins",
-					"name": "Poppins"
+					"name": "Poppins",
+					"google": "family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900"
 				},
 				{
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
@@ -165,6 +148,11 @@
 	},
 	"styles": {
 		"blocks": {
+			"core/button": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)"
+				}
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -173,7 +161,7 @@
 			"core/post-date": {
 				"color": {
 					"link": null,
-					"text": null 
+					"text": null
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -181,6 +169,7 @@
 			},
 			"core/post-title": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
@@ -198,31 +187,37 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "41.47px"
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "24px"
 				}
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
@@ -231,6 +226,9 @@
 					"text": "var(--wp--custom--color--foreground)"
 				}
 			}
+		},
+		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--poppins)"
 		}
 	}
 }

mayland-blocks/theme.json

@@ -106,7 +106,6 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)",
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": 600,
 					"lineHeight": 2
@@ -167,6 +166,31 @@
 					"style": "solid",
 					"width": "2px"
 				},
+				"checkbox": {
+					"checked": {
+						"content": "\"\\2715\"",
+						"fontSize": "14px",
+						"position": {
+							"left": "3px",
+							"top": "4px"
+						},
+						"sizing": {
+							"height": "12px",
+							"width": "12px"
+						}
+					},
+					"unchecked": {
+						"content": "\"\"",
+						"position": {
+							"left": "0",
+							"top": "0.2em"
+						},
+						"sizing": {
+							"height": "16px",
+							"width": "16px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent",
 					"boxShadow": "none",
@@ -188,14 +212,12 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"lineHeight": 1.6
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--poppins)",
-					"fontWeight": 600,
+					"fontWeight": 400,
 					"lineHeight": 1.125
 				}
 			},
@@ -225,7 +247,6 @@
 				"dropcap": {
 					"margin": ".1em .1em 0 0",
 					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
 						"fontSize": "110px",
 						"fontWeight": "400"
 					}
@@ -295,9 +316,6 @@
 					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
 			},
-			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,400;0,600;1,400"
-			],
 			"width": {
 				"default": "750px",
 				"wide": "1022px"
@@ -310,6 +328,7 @@
 		"spacing": {
 			"customPadding": true,
 			"units": [
+				"%",
 				"px",
 				"em",
 				"rem",
@@ -324,7 +343,8 @@
 				{
 					"fontFamily": "\"Poppins\", sans-serif",
 					"slug": "poppins",
-					"name": "Poppins"
+					"name": "Poppins",
+					"google": "family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900"
 				},
 				{
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
@@ -383,7 +403,7 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)"
@@ -412,7 +432,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
@@ -484,7 +504,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "41.47px"
@@ -492,7 +512,7 @@
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
@@ -500,7 +520,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
@@ -508,7 +528,7 @@
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "24px"
@@ -516,7 +536,7 @@
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -524,7 +544,7 @@
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--poppins)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -538,7 +558,7 @@
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--custom--body--typography--font-family)",
+			"fontFamily": "var(--wp--preset--font-family--poppins)",
 			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}

quadrat/assets/theme.css

@@ -320,8 +320,8 @@ ul ul {
 	align-items: flex-end;
 }
 
-.wp-block-post-comments {
-	line-height: var(--wp--custom--body--typography--line-height);
+.wp-block-post-comments .reply {
+	margin-bottom: 30px;
 }
 
 .wp-block-post-comments .reply a {
@@ -348,10 +348,6 @@ ul ul {
 }
 
 .wp-block-post-comments form {
-	display: grid;
-	-moz-column-gap: 1em;
-	     column-gap: 1em;
-	grid-template-rows: auto;
 	grid-template-areas: "notes notes" "author author" "email url" "comment comment" "cookies-consent cookies-consent" "form-submit form-submit";
 }
 
@@ -363,87 +359,6 @@ ul ul {
 	width: 100%;
 }
 
-.wp-block-post-comments form p {
-	margin-top: 0;
-}
-
-.wp-block-post-comments form .comment-notes {
-	grid-area: notes;
-}
-
-.wp-block-post-comments form .comment-form-author {
-	grid-area: author;
-}
-
-.wp-block-post-comments form .comment-form-email {
-	grid-area: email;
-}
-
-.wp-block-post-comments form .comment-form-url {
-	grid-area: url;
-}
-
-.wp-block-post-comments form .comment-form-comment {
-	grid-area: comment;
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent {
-	grid-area: cookies-consent;
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] {
-	border: 0;
-	clip: rect(1px, 1px, 1px, 1px);
-	-webkit-clip-path: inset(50%);
-	        clip-path: inset(50%);
-	height: 1px;
-	margin: -1px;
-	overflow: hidden;
-	padding: 0;
-	position: absolute;
-	width: 1px;
-	word-wrap: normal !important;
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + label {
-	margin-left: 0;
-	padding-left: 2em;
-	position: relative;
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + ::before,
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + ::after {
-	box-sizing: border-box;
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"] + ::before {
-	content: "";
-	position: absolute;
-	top: 0.2em;
-	left: 0;
-	width: 16px;
-	height: 16px;
-	border: 1px solid var(--wp--custom--color--foreground);
-}
-
-.wp-block-post-comments form .comment-form-cookies-consent input[type="checkbox"]:checked + ::after {
-	content: "\2715";
-	width: 12px;
-	height: 12px;
-	position: absolute;
-	top: 4px;
-	left: 3px;
-	font-size: 14px;
-}
-
-.wp-block-post-comments form .form-submit {
-	grid-area: form-submit;
-}
-
-.wp-block-post-comments .reply {
-	margin-bottom: 30px;
-}
-
 .wp-block-post-comments .commentmetadata {
 	margin-bottom: 20px;
 }

quadrat/child-theme.json

@@ -146,24 +146,21 @@
 					}
 				}
 			],
-			"fontsToLoadFromGoogle": [
-				"family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-			],
 			"form": {
 				"border": {
-					"color": "var(--wp--custom--color--foreground)"
+					"color": "var(--wp--custom--color--foreground)",
+					"style": "solid",
+					"width": "2px"
 				},
 				"padding": "20px"
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"lineHeight": 1.7
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "500"
 				}
 			},
@@ -214,16 +211,6 @@
 			"contentSize": "664px",
 			"wideSize": "1128px"
 		},
-		"spacing": {
-			"customPadding": true,
-			"units": [
-				"px",
-				"em",
-				"rem",
-				"vh",
-				"vw"
-			]
-		},
 		"typography": {
 			"customFontSize": true,
 			"customLineHeight": true,
@@ -231,7 +218,8 @@
 				{
 					"fontFamily": "\"DM Sans\", sans-serif",
 					"slug": "dm-sans",
-					"name": "DM Sans"
+					"name": "DM Sans",
+					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
 				}
 			],
 			"fontSizes": [
@@ -276,6 +264,7 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)"
 				}
@@ -306,6 +295,7 @@
 			},
 			"core/post-title": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(48px, 7vw), 80px)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2
@@ -383,36 +373,42 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(48px, 7vw), 80px)",
 					"lineHeight": 1.2
 				}
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(36px, 6vw), 65px)",
 					"lineHeight": 1.2
 				}
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(28px, 5vw), 38px)",
 					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "20px",
 					"lineHeight": 1.4
 				}
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "18px",
 					"lineHeight": 1.4
 				}
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "16px",
 					"lineHeight": 1.4
 				}
@@ -424,6 +420,7 @@
 			}
 		},
 		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 			"fontWeight": "400"
 		},
 		"core/site-logo": {

quadrat/sass/blocks/_post-comments.scss

@@ -1,37 +1,35 @@
 @import "../../../blockbase/sass/blocks/button-mixins";
 
 .wp-block-post-comments {
+	.reply {
+		margin-bottom: 30px;
 
-	line-height: var(--wp--custom--body--typography--line-height);
-
-	.reply a {
-		--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
-		@include button-border-styles;
-		--wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
-		--wp--custom--button--color--background: var(--wp--custom--button--hover--color--background);
-		--wp--custom--button--border--color: var(--wp--custom--button--hover--color--text);
+		a {
+			--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+			@include button-border-styles;
+			--wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
+			--wp--custom--button--color--background: var(--wp--custom--button--hover--color--background);
+			--wp--custom--button--border--color: var(--wp--custom--button--hover--color--text);
 
-		& ,
-		&:hover,
-		&:focus,
-		&:active {
-			line-height: 1;
-		}
-		&:not(.has-background):not(.has-text-color) {
+			& ,
 			&:hover,
 			&:focus,
-			&.has-focus {
-				--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
-				--wp--custom--button--color--text: var(--wp--custom--button--hover--color--background);
-				--wp--custom--button--color--background: var(--wp--custom--button--hover--color--text);
+			&:active {
+				line-height: 1;
+			}
+			&:not(.has-background):not(.has-text-color) {
+				&:hover,
+				&:focus,
+				&.has-focus {
+					--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+					--wp--custom--button--color--text: var(--wp--custom--button--hover--color--background);
+					--wp--custom--button--color--background: var(--wp--custom--button--hover--color--text);
+				}
 			}
 		}
 	}
 
 	form {
-		display: grid;
-		column-gap: 1em;
-		grid-template-rows: auto;
 		grid-template-areas:
 			"notes notes"
 			"author author"
@@ -47,74 +45,6 @@
 			font-size: var(--wp--preset--font-size--normal);
 			width: 100%;
 		}
-
-		p {
-			margin-top: 0;
-		}
-
-		.comment-notes {
-			grid-area: notes;
-		}
-
-		.comment-form-author {
-			grid-area: author;
-		}
-
-		.comment-form-email {
-			grid-area: email;
-		}
-
-		.comment-form-url {
-			grid-area: url;
-		}
-
-		.comment-form-comment {
-			grid-area: comment;
-		}
-
-		.comment-form-cookies-consent {
-			grid-area: cookies-consent;
-
-			input[type="checkbox"] {
-				@include hide-accesibly;
-				& + label {
-					margin-left: 0;
-					padding-left: 2em;
-					position: relative;
-				}
-				& + ::before,
-				& + ::after {
-					box-sizing: border-box;
-				}
-				& + ::before {
-					content: "";
-					position: absolute;
-					top: 0.2em;
-					left: 0;
-					width: 16px;
-					height: 16px;
-					border: 1px solid var(--wp--custom--color--foreground);
-				}
-				&:checked + ::after {
-					content: "\2715";
-					width: 12px;
-					height: 12px;
-					position: absolute;
-					top: 4px;
-					left: 3px;
-					font-size: 14px;
-				}
-			}
-
-		}
-
-		.form-submit {
-			grid-area: form-submit;
-		}
-	}
-
-	.reply {
-		margin-bottom: 30px;
 	}
 
 	.commentmetadata {

quadrat/theme.json

@@ -96,7 +96,6 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)",
 					"fontSize": "20px",
 					"fontWeight": "700",
 					"lineHeight": 2
@@ -205,6 +204,31 @@
 					"style": "solid",
 					"width": "2px"
 				},
+				"checkbox": {
+					"checked": {
+						"content": "\"\\2715\"",
+						"fontSize": "14px",
+						"position": {
+							"left": "3px",
+							"top": "4px"
+						},
+						"sizing": {
+							"height": "12px",
+							"width": "12px"
+						}
+					},
+					"unchecked": {
+						"content": "\"\"",
+						"position": {
+							"left": "0",
+							"top": "0.2em"
+						},
+						"sizing": {
+							"height": "16px",
+							"width": "16px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent",
 					"boxShadow": "none",
@@ -226,13 +250,11 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"lineHeight": 1.7
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "500",
 					"lineHeight": 1.125
 				}
@@ -263,7 +285,6 @@
 				"dropcap": {
 					"margin": "0 .2em .2em 0",
 					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
 						"fontSize": "var(--wp--preset--font-size--huge)",
 						"fontWeight": "400"
 					}
@@ -334,9 +355,6 @@
 					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
 			},
-			"fontsToLoadFromGoogle": [
-				"family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
-			],
 			"line-height": {
 				"body": 1.7
 			}
@@ -348,6 +366,7 @@
 		"spacing": {
 			"customPadding": true,
 			"units": [
+				"%",
 				"px",
 				"em",
 				"rem",
@@ -362,7 +381,8 @@
 				{
 					"fontFamily": "\"DM Sans\", sans-serif",
 					"slug": "dm-sans",
-					"name": "DM Sans"
+					"name": "DM Sans",
+					"google": "family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
 				}
 			],
 			"fontSizes": [
@@ -410,7 +430,7 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)"
@@ -447,7 +467,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "min(max(48px, 7vw), 80px)",
 					"lineHeight": 1.2,
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)"
@@ -560,7 +580,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
 					"fontSize": "min(max(48px, 7vw), 80px)"
@@ -568,7 +588,7 @@
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
 					"fontSize": "min(max(36px, 6vw), 65px)"
@@ -576,7 +596,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
 					"fontSize": "min(max(28px, 5vw), 38px)"
@@ -584,7 +604,7 @@
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
 					"fontSize": "20px"
@@ -592,7 +612,7 @@
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
 					"fontSize": "18px"
@@ -600,7 +620,7 @@
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
 					"fontSize": "16px"
@@ -614,7 +634,7 @@
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--custom--body--typography--font-family)",
+			"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		},

seedlet-blocks/assets/theme.css

@@ -215,10 +215,6 @@ is passed all of the block attributes on the block definition in the template. *
 	margin-bottom: var(--wp--custom--margin--baseline);
 }
 
-.wp-block-post-comments input[type=checkbox] + label {
-	margin-left: 0;
-}
-
 .wp-block-post-comments .commentlist .comment {
 	padding-left: 0;
 }
@@ -252,19 +248,12 @@ is passed all of the block attributes on the block definition in the template. *
 	font-size: var(--global--font-size-xs);
 }
 
-.wp-block-post-comments .comment-form {
-	display: grid;
-	column-gap: 1em;
-	grid-template-rows: auto;
-	grid-template-areas: "notes notes" "comment comment" "author email" "url url" "cookies-consent cookies-consent" "form-submit form-submit";
-}
-
-.wp-block-post-comments .comment-form p {
+.wp-block-post-comments form p {
 	margin-top: var(--wp--custom--margin--baseline);
 	margin-bottom: var(--wp--custom--margin--baseline);
 }
 
-.wp-block-post-comments .comment-form input[type="submit"] {
+.wp-block-post-comments form input[type="submit"] {
 	border-radius: var(--wp--custom--button--border--radius);
 	cursor: pointer;
 	font-size: var(--wp--preset--font-size--normal);
@@ -272,58 +261,29 @@ is passed all of the block attributes on the block definition in the template. *
 	padding: 23px 25px;
 }
 
-.wp-block-post-comments .comment-form input[type="submit"]:not(.has-background):not(.has-text-color):hover, .wp-block-post-comments .comment-form input[type="submit"]:not(.has-background):not(.has-text-color):focus, .wp-block-post-comments .comment-form input[type="submit"]:not(.has-background):not(.has-text-color).has-focus {
+.wp-block-post-comments form input[type="submit"]:not(.has-background):not(.has-text-color):hover, .wp-block-post-comments form input[type="submit"]:not(.has-background):not(.has-text-color):focus, .wp-block-post-comments form input[type="submit"]:not(.has-background):not(.has-text-color).has-focus {
 	padding: 23px 25px;
 }
 
-.wp-block-post-comments .comment-form .comment-form-cookies-consent > label,
-.wp-block-post-comments .comment-form .comment-notes {
+.wp-block-post-comments form .comment-form-cookies-consent > label,
+.wp-block-post-comments form .comment-notes {
 	font-size: var(--wp--preset--font-size--tiny);
 }
 
-.wp-block-post-comments .comment-form input:not([type=submit]):not([type=checkbox]),
-.wp-block-post-comments .comment-form textarea {
-	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
+.wp-block-post-comments form input:not([type=submit]):not([type=checkbox]),
+.wp-block-post-comments form textarea {
 	font-size: var(--wp--preset--font-size--small);
 	width: 100%;
 }
 
-.wp-block-post-comments .comment-form input:not([type=submit]):not([type=checkbox]):focus,
-.wp-block-post-comments .comment-form textarea:focus {
+.wp-block-post-comments form input:not([type=submit]):not([type=checkbox]):focus,
+.wp-block-post-comments form textarea:focus {
 	color: var(--wp--custom--form--color--text);
 	outline-width: 1px;
 	outline-style: dotted;
 	outline-color: var(--wp--custom--form--color--text);
 }
 
-.wp-block-post-comments .comment-notes {
-	grid-area: notes;
-}
-
-.wp-block-post-comments .comment-form-author {
-	grid-area: author;
-}
-
-.wp-block-post-comments .comment-form-email {
-	grid-area: email;
-}
-
-.wp-block-post-comments .comment-form-url {
-	grid-area: url;
-}
-
-.wp-block-post-comments .comment-form-comment {
-	grid-area: comment;
-}
-
-.wp-block-post-comments .comment-form-cookies-consent {
-	grid-area: cookies-consent;
-}
-
-.wp-block-post-comments .form-submit {
-	grid-area: form-submit;
-}
-
 .wp-block-pullquote.is-style-solid-color {
 	padding: var(--wp--custom--margin--horizontal);
 }

seedlet-blocks/child-theme.json

@@ -82,11 +82,6 @@
 			]
 		},
 		"custom": {
-			"body": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--fira-sans)"
-				}
-			},
 			"button": {
 				"border": {
 					"color": "var(--wp--custom--color--primary)"
@@ -100,15 +95,6 @@
 					}
 				}
 			},
-			"fontsToLoadFromGoogle": [
-				"family=Fira+Sans:ital,wght@0,400;0,500;1,400",
-				"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
-			],
-			"heading": {
-				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
-				}	
-			},
 			"latest-posts": {
 				"meta": {
 					"color": {
@@ -122,9 +108,6 @@
 			},
 			"pullquote": {
 				"citation": {
-					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)"
-					},
 					"spacing": {
 						"margin": {
 							"top": "20px"
@@ -147,12 +130,14 @@
 				{
 					"fontFamily": "'Fira Sans', Helvetica, Arial, sans-serif",
 					"slug": "fira-sans",
-					"name": "Fira Sans"
+					"name": "Fira Sans",
+					"google": "family=Fira+Sans:ital,wght@0,100..900;1,100..900"
 				},
 				{
 					"fontFamily": "'Playfair Display', Georgia, Times, serif",
 					"slug": "playfair-display",
-					"name": "Playfair Display"
+					"name": "Playfair Display",
+					"google": "family=Playfair+Display:ital,wght@0,400..900;1,400..900"
 				}
 			],
 			"fontSizes": [
@@ -190,6 +175,16 @@
 	},
 	"styles": {
 		"blocks": {
+			"core/button": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--fira-sans)"
+				}
+			},
+			"core/post-title": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
 			"core/pullquote": {
 				"border": {
 					"style": "none"
@@ -206,7 +201,7 @@
 					"fontSize": "32px",
 					"fontStyle": "italic",
 					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)"
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				}
 			},
 			"core/separator": {
@@ -219,6 +214,41 @@
 					"link": "var(--wp--custom--color--primary)"
 				}
 			}
+		},
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
+			"h2": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
+			"h4": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
+			"h5": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
+				}
+			}
+		},
+		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--fira-sans)"
 		}
 	}
 }

seedlet-blocks/sass/blocks/_post-comments.scss

@@ -38,10 +38,6 @@
 		margin-bottom: var(--wp--custom--margin--baseline);
 	}
 
-	input[type=checkbox] + label {
-		margin-left: 0;
-	}
-
 	.commentlist {
 		.comment {
 			padding-left: 0;
@@ -79,18 +75,7 @@
 		}
 	}
 
-	.comment-form {
-		display: grid;
-		column-gap: 1em;
-		grid-template-rows: auto;
-		grid-template-areas:
-			"notes notes"
-			"comment comment"
-			"author email"
-			"url url"
-			"cookies-consent cookies-consent"
-			"form-submit form-submit";
-
+	form {
 		p {
 			margin-top: var(--wp--custom--margin--baseline);
 			margin-bottom: var(--wp--custom--margin--baseline);
@@ -119,7 +104,6 @@
 
 		input:not([type=submit]):not([type=checkbox]),
 		textarea {
-			border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
 			font-size: var(--wp--preset--font-size--small);
 			width: 100%;
 
@@ -131,32 +115,4 @@
 			}
 		}
 	}
-
-	.comment-notes {
-		grid-area: notes;
-	}
-
-	.comment-form-author {
-		grid-area: author;
-	}
-
-	.comment-form-email {
-		grid-area: email;
-	}
-
-	.comment-form-url {
-		grid-area: url;
-	}
-
-	.comment-form-comment {
-		grid-area: comment;
-	}
-
-	.comment-form-cookies-consent {
-		grid-area: cookies-consent;
-	}
-
-	.form-submit {
-		grid-area: form-submit;
-	}
 }

seedlet-blocks/theme.json

@@ -139,7 +139,6 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)",
 					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "normal",
 					"lineHeight": 2
@@ -200,6 +199,31 @@
 					"style": "solid",
 					"width": "2px"
 				},
+				"checkbox": {
+					"checked": {
+						"content": "\"\\2715\"",
+						"fontSize": "14px",
+						"position": {
+							"left": "3px",
+							"top": "4px"
+						},
+						"sizing": {
+							"height": "12px",
+							"width": "12px"
+						}
+					},
+					"unchecked": {
+						"content": "\"\"",
+						"position": {
+							"left": "0",
+							"top": "0.2em"
+						},
+						"sizing": {
+							"height": "16px",
+							"width": "16px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent",
 					"boxShadow": "none",
@@ -221,13 +245,11 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--fira-sans)",
 					"lineHeight": 1.6
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": 400,
 					"lineHeight": 1.125
 				}
@@ -258,7 +280,6 @@
 				"dropcap": {
 					"margin": ".1em .1em 0 0",
 					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
 						"fontSize": "110px",
 						"fontWeight": "400"
 					}
@@ -285,7 +306,7 @@
 				"citation": {
 					"typography": {
 						"fontSize": "var(--wp--preset--font-size--tiny)",
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
+						"fontFamily": "inherit",
 						"fontStyle": "italic"
 					},
 					"spacing": {
@@ -327,11 +348,7 @@
 					"textAlign": "center",
 					"margin": "var(--wp--custom--margin--vertical) auto"
 				}
-			},
-			"fontsToLoadFromGoogle": [
-				"family=Fira+Sans:ital,wght@0,400;0,500;1,400",
-				"family=Playfair+Display:ital,wght@0,400;0,700;1,400"
-			]
+			}
 		},
 		"layout": {
 			"contentSize": "620px",
@@ -340,6 +357,7 @@
 		"spacing": {
 			"customPadding": true,
 			"units": [
+				"%",
 				"px",
 				"em",
 				"rem",
@@ -354,12 +372,14 @@
 				{
 					"fontFamily": "'Fira Sans', Helvetica, Arial, sans-serif",
 					"slug": "fira-sans",
-					"name": "Fira Sans"
+					"name": "Fira Sans",
+					"google": "family=Fira+Sans:ital,wght@0,100..900;1,100..900"
 				},
 				{
 					"fontFamily": "'Playfair Display', Georgia, Times, serif",
 					"slug": "playfair-display",
-					"name": "Playfair Display"
+					"name": "Playfair Display",
+					"google": "family=Playfair+Display:ital,wght@0,400..900;1,400..900"
 				}
 			],
 			"fontSizes": [
@@ -412,7 +432,7 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--fira-sans)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)"
@@ -441,7 +461,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
@@ -464,7 +484,7 @@
 					"fontStyle": "italic",
 					"fontSize": "32px",
 					"lineHeight": "1.3",
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)"
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)"
 				},
 				"spacing": {
 					"padding": {
@@ -518,7 +538,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "48px"
@@ -526,7 +546,7 @@
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "32px"
@@ -534,7 +554,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--huge)"
@@ -542,7 +562,7 @@
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--large)"
@@ -550,7 +570,7 @@
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--normal)"
@@ -558,7 +578,7 @@
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--playfair-display)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)",
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -572,7 +592,7 @@
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--custom--body--typography--font-family)",
+			"fontFamily": "var(--wp--preset--font-family--fira-sans)",
 			"fontSize": "var(--wp--preset--font-size--normal)"
 		}
 	}

skatepark/404.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * The template for displaying 404 pages (not found)
+ *
+ * @package Skatepark
+ * @since 1.1.1
+ */
+get_header();
+?>
+	<main class="container-404">
+		<h2 class="wp-block-post-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'skatepark' ); ?></h1>
+
+		<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'skatepark' ); ?></p>
+
+		<?php echo do_blocks('<!-- wp:search {"label":""} /-->'); ?>
+	</main>
+<?php
+get_footer();

skatepark/assets/theme.css

@@ -112,6 +112,100 @@
 	background-color: var(--wp--custom--button--color--text);
 }
 
+.wp-block-post-comments .reply a {
+	--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+	border-style: var(--wp--custom--button--border--style);
+	border-width: var(--wp--custom--button--border--width);
+	padding-top: var(--wp--custom--button--spacing--padding--top);
+	padding-bottom: var(--wp--custom--button--spacing--padding--bottom);
+	padding-left: var(--wp--custom--button--spacing--padding--left);
+	padding-right: var(--wp--custom--button--spacing--padding--right);
+	--wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
+	--wp--custom--button--color--background: var(--wp--custom--button--color--background);
+	--wp--custom--button--border--color: var(--wp--custom--button--hover--color--text);
+}
+
+.wp-block-post-comments .reply a, .wp-block-post-comments .reply a:hover, .wp-block-post-comments .reply a:focus, .wp-block-post-comments .reply a:active {
+	line-height: 1;
+}
+
+.wp-block-post-comments .reply a:not(.has-background):not(.has-text-color):hover, .wp-block-post-comments .reply a:not(.has-background):not(.has-text-color):focus, .wp-block-post-comments .reply a:not(.has-background):not(.has-text-color).has-focus {
+	--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+	--wp--custom--button--color--text: var(--wp--custom--button--hover--color--background);
+	--wp--custom--button--color--background: var(--wp--custom--button--hover--color--text);
+}
+
+.wp-block-post-comments form {
+	-moz-column-gap: 1.2em;
+	     column-gap: 1.2em;
+	grid-template-areas: "notes notes" "comment comment" "author email" "url url" "cookies-consent cookies-consent" "form-submit form-submit";
+}
+
+.wp-block-post-comments form input:not([type=submit]):not([type=checkbox]),
+.wp-block-post-comments form textarea {
+	font-size: var(--wp--preset--font-size--normal);
+	width: 100%;
+}
+
+.wp-block-post-comments form label:not([for=wp-comment-cookies-consent]) {
+	font-size: var(--wp--custom--form--label--typography--font-size);
+	font-weight: var(--wp--custom--form--label--typography--font-weight);
+	letter-spacing: var(--wp--custom--form--label--typography--letter-spacing);
+	margin-bottom: var(--wp--custom--form--label--spacing--margin--bottom);
+	text-transform: var(--wp--custom--form--label--typography--text-transform);
+}
+
+.wp-block-post-comments form p {
+	margin-top: 0;
+	margin-bottom: 30px;
+}
+
+.wp-block-post-comments form .comment-form-comment textarea {
+	vertical-align: top;
+}
+
+.wp-block-post-comments form .comment-form-cookies-consent {
+	margin-bottom: var(--wp--custom--margin--vertical);
+}
+
+.wp-block-post-comments .comment-reply-title {
+	margin-bottom: 30px;
+}
+
+.wp-block-post-comments .comment-author {
+	margin-bottom: var(--wp--custom--margin--baseline);
+}
+
+.wp-block-post-comments .comment-author cite {
+	font-weight: bold;
+}
+
+.wp-block-post-comments .comment-author .says {
+	display: none;
+}
+
+.wp-block-post-comments .commentmetadata {
+	margin-bottom: 36px;
+}
+
+.wp-block-post-comments .commentmetadata a {
+	font-weight: 500;
+}
+
+.wp-block-post-comments .commentlist {
+	margin-bottom: calc( 4 * var(--wp--custom--margin--baseline));
+}
+
+.wp-block-post-comments .comment-body > p > a,
+.wp-block-post-comments .comment-edit-link {
+	text-decoration: underline;
+}
+
+.wp-block-post-comments .comment-body > p > a:hover,
+.wp-block-post-comments .comment-edit-link:hover {
+	text-decoration: none;
+}
+
 .wp-block-search .wp-block-search__button:active, .wp-block-search .wp-block-search__button:focus {
 	outline-offset: -0.25em;
 }
@@ -163,6 +257,36 @@
 	left: calc( -1 * var(--wp--custom--button--border--width));
 }
 
+.is-style-skatepark-aside-caption {
+	align-items: center;
+	display: flex;
+	flex-direction: column;
+}
+
+.is-style-skatepark-aside-caption img {
+	justify-self: center;
+}
+
+.is-style-skatepark-aside-caption figcaption {
+	align-self: flex-end;
+	border-top: 3px solid var(--wp--preset--color--primary);
+	font-size: var(--wp--preset--font-size--small);
+	margin-bottom: 0;
+	margin-top: 20px;
+	padding-top: 20px;
+	max-width: 455px;
+	text-align: left;
+}
+
+.is-style-skatepark-aside-caption.alignfull figcaption {
+	margin-left: var(--wp--custom--post-content--padding--left);
+	margin-right: calc( max( 0.5 * ( 100% - var(--wp--custom--layout--wide-size) ), var(--wp--custom--post-content--padding--left) ));
+}
+
+.is-style-indented-paragraph {
+	text-indent: 10em;
+}
+
 .pre-footer h3 {
 	text-transform: uppercase;
 }
@@ -218,6 +342,13 @@
 	margin-bottom: 0;
 }
 
+h1.is-style-skatepark-heading-border, h2.is-style-skatepark-heading-border, h3.is-style-skatepark-heading-border, h4.is-style-skatepark-heading-border, h5.is-style-skatepark-heading-border, h6.is-style-skatepark-heading-border {
+	display: inline-block;
+	border-top: 2px solid var(--wp--custom--color--primary);
+	margin-bottom: 0;
+	padding-top: 1em;
+}
+
 a {
 	text-decoration-thickness: 0.07em;
 	text-underline-offset: 0.46ex;
@@ -234,12 +365,14 @@ a {
 	color: var(--wp--custom--color--background);
 }
 
+.wp-block-post-comments .comment-meta > a,
 .wp-block-post-comments .comment-body > p > a,
 .wp-block-post-comments .comment-edit-link {
 	-webkit-text-decoration-line: underline;
 	        text-decoration-line: underline;
 }
 
+.wp-block-post-comments .comment-meta > a:hover,
 .wp-block-post-comments .comment-body > p > a:hover,
 .wp-block-post-comments .comment-edit-link:hover {
 	-webkit-text-decoration-line: none;

skatepark/child-theme.json

@@ -80,7 +80,6 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"lineHeight": 1.6
 				}
 			},
@@ -133,30 +132,67 @@
 					}
 				}
 			],
+			"fontsToLoadFromGoogle": [
+				"family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
+			],
 			"form": {
-				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"border": {
 					"color": "var(--wp--custom--color--primary)",
+					"radius": "0",
+					"style": "solid",
 					"width": "3px"
 				},
+				"checkbox": {
+					"checked": {
+						"fontSize": "var(--wp--preset--font-size--normal)",
+						"position": {
+							"left": "7px",
+							"top": "3px"
+						},
+						"sizing": {
+							"height": "25px",
+							"width": "25px"
+						}
+					},
+					"unchecked": {
+						"position": {
+							"top": "-0.4em"
+						},
+						"sizing": {
+							"height": "30px",
+							"width": "30px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent"
 				},
+				"label": {
+					"spacing": {
+						"margin": {
+							"bottom": "var(--wp--custom--margin--baseline)"
+						}
+					},
+					"typography": {
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontWeight": "900",
+						"letterSpacing": ".1em",
+						"textTransform": "uppercase"
+					}
+				},
+				"padding": "calc( 0.5 * var(--wp--custom--margin--horizontal) )",
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"fontsToLoadFromGoogle": [
-				"family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
-			],
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "700"
 				}
 			},
 			"layout": {
-				"contentSize": "684px"
+				"contentSize": "684px",
+				"wideSize": "1194px"
 			},
 			"line-height": {
 				"body": 1.6
@@ -178,7 +214,8 @@
 				{
 					"fontFamily": "\"Red Hat Display\", sans-serif",
 					"slug": "red-hat-display",
-					"name": "Red Hat Display"
+					"name": "Red Hat Display",
+					"google": "family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
 				}
 			],
 			"fontSizes": [
@@ -223,9 +260,21 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"letterSpacing": "0.1em"
+					"letterSpacing": "0.1em",
+					"textTransform": "uppercase"
+				}
+			},
+			"core/post-title": {
+				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)"
+				}
+			},
+			"core/separator": {
+				"border": {
+					"width": "0 0 3px 0"
 				}
 			},
 			"core/site-title": {
@@ -245,6 +294,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "min(max(48px, 7vw), 72px)",
 					"fontWeight": "700",
 					"lineHeight": 1.2
@@ -252,6 +302,7 @@
 			},
 			"h2": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "min(max(36px, 5vw), 64px)",
 					"fontWeight": "900",
 					"lineHeight": 1.2
@@ -259,6 +310,7 @@
 			},
 			"h3": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "min(max(30px, 5vw), 48px)",
 					"fontWeight": "900",
 					"lineHeight": 1.3
@@ -266,6 +318,7 @@
 			},
 			"h4": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
 					"letterSpacing": "0.1em",
@@ -275,6 +328,7 @@
 			},
 			"h5": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
 					"letterSpacing": "0.1em",
@@ -284,6 +338,7 @@
 			},
 			"h6": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--preset--font-size--tiny)",
 					"fontWeight": "900",
 					"letterSpacing": "0.1em",
@@ -293,6 +348,7 @@
 			}
 		},
 		"typography": {
+			"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 			"fontWeight": "400"
 		}
 	}

skatepark/functions.php

@@ -42,7 +42,17 @@ function skatepark_scripts() {
 }
 add_action( 'wp_enqueue_scripts', 'skatepark_scripts' );
 
+/**
+ * Block Styles.
+ */
+require get_stylesheet_directory() . '/inc/block-styles.php';
+
 /**
  * Block Patterns.
  */
 require get_stylesheet_directory() . '/inc/block-patterns.php';
+
+/**
+ * Block Styles.
+ */
+require get_stylesheet_directory() . '/inc/block-styles.php';

skatepark/inc/block-patterns.php

@@ -19,7 +19,10 @@ if ( ! function_exists( 'skatepark_register_block_patterns' ) ) :
 		if ( function_exists( 'register_block_pattern' ) ) {
 			$block_patterns = array(
 				'pre-footer',
-				'testimonial'
+				'text-list-with-button',
+				'full-width-image-with-aside-caption',
+				'testimonial',
+				'two-columns-of-text',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {

skatepark/inc/block-styles.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Skatepark Theme: Block Styles
+ *
+ * @package Skatepark
+ * @since 1.0.0
+ */
+
+if ( ! function_exists( 'skatepark_register_block_styles' ) ) :
+
+	function skatepark_register_block_styles() {
+
+		if ( function_exists( 'register_block_style' ) ) {
+
+			/**
+			 * Register block styles
+			 */
+			register_block_style(
+				'core/heading',
+				array(
+					'name'         => 'skatepark-heading-border',
+					'label'        => __( 'Top Border', 'skatepark' ),
+					'style_handle' => 'skatepark-heading-border',
+				)
+			);
+
+			register_block_style(
+				'core/image',
+				array(
+					'name'         => 'skatepark-aside-caption',
+					'label'        => __( 'Aside caption', 'skatepark' ),
+					'style_handle' => 'skatepark-aside-caption',
+					)
+				);
+	
+			register_block_style(
+				'core/paragraph',
+				array(
+					'name'         => 'indented-paragraph',
+					'label'        => __( 'Indented paragraph', 'skatepark' ),
+					'style_handle' => 'indented-paragraph',
+				)
+			);
+		}
+	}
+endif;
+
+add_action( 'after_setup_theme', 'skatepark_register_block_styles' );

skatepark/inc/patterns/full-width-image-with-aside-caption.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Full width image with aside caption.
+ *
+ * @package Skatepark
+ */
+
+return array(
+	'title'      => __( 'Full width image with aside caption', 'skatepark' ),
+	'categories' => array( 'skatepark' ),
+	'content'    => '<!-- wp:image {"align":"full","sizeSlug":"large","linkDestination":"none","style":{"color":{"duotone":["#000","#BFF5A5"]},"border":{"radius":"0px"}},"className":"is-style-skatepark-aside-caption"} -->
+	<figure class="wp-block-image alignfull size-large is-style-skatepark-aside-caption" style="border-radius:0px"><img src="https://skateparkdemo.files.wordpress.com/2021/08/stocksnap_5otfjyvyse.jpg" alt="' . esc_attr__( "A skateboarder does a grab trick in a bowl-shaped skate park. In the background is a watching crowd, palm trees, and the ocean.", 'skatepark' ) . '"/><figcaption>' . esc_html__( "Learn the basics of skating along with a group of your peers. More advanced at skating? Our skateboarding coaches will work with you 1:1 to advance your technique.", 'skatepark' ) . '</figcaption></figure>
+	<!-- /wp:image -->',
+);

skatepark/inc/patterns/text-list-with-button.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Text list with Button.
+ *
+ * @package Skatepark
+ * @since 1.0.0
+ * 
+ */
+
+return array(
+	'title'      => __( 'Text List with Button', 'skatepark' ),
+	'categories' => array( 'skatepark' ),
+	'content'    => '<!-- wp:columns {"align":"wide"} -->
+		<div class="wp-block-columns alignwide"><!-- wp:column {"width":"75%"} -->
+		<div class="wp-block-column" style="flex-basis:75%"><!-- wp:heading {"level":4,"className":"is-style-skatepark-heading-border"} -->
+		<h4 class="is-style-skatepark-heading-border">' . esc_html__( 'Visiting Coaches', 'skatepark' ) . '</h4>
+		<!-- /wp:heading -->
+		<!-- wp:heading --><h2>' . esc_html__( 'Rodney Mullen. Paul Rodriguez. Bucky Lasek. Bob Burnquist. Tony Hawk. Ryan Sheckler. Eric Koston. Bam Margera. Chris Cole. Andrew Reynolds.', 'skatepark' ) . '</h2>
+		<!-- /wp:heading -->
+		<!-- wp:buttons -->
+		<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline"} -->
+		<div class="wp-block-button is-style-outline"><a class="wp-block-button__link">' . esc_html__( 'See All Faculty', 'skatepark' ) . '</a></div>
+		<!-- /wp:button --></div>
+		<!-- /wp:buttons --></div>
+		<!-- /wp:column -->
+		<!-- wp:column {"width":"25%"} -->
+		<div class="wp-block-column" style="flex-basis:25%"></div>
+		<!-- /wp:column --></div>
+		<!-- /wp:columns -->'
+);

skatepark/inc/patterns/two-columns-of-text.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Two columns of text.
+ *
+ * @package Skatepark
+ */
+
+return array(
+	'title'      => __( 'Two columns of text', 'skatepark' ),
+	'categories' => array( 'skatepark' ),
+	'content'    => '<!-- wp:columns {"align":"wide"} -->
+	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"","style":{"spacing":{"padding":{"right":"5em"}}}} -->
+	<div class="wp-block-column" style="padding-right:5em"><!-- wp:paragraph {"fontSize":"medium"} -->
+	<p class="has-medium-font-size">' . esc_html__( 'Rodney Mullen. Paul Rodriguez. Bucky Lasek. Bob Burnquist. Tony Hawk. Ryan Sheckler. Eric Koston. Bam Margera. Chris Cole. Andrew Reynolds. The are all skateboarding icons. Some of them even have video games you may have played.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"550px"} -->
+	<div class="wp-block-column" style="flex-basis:550px"><!-- wp:paragraph {"className":"is-style-indented-paragraph"} -->
+	<p class="is-style-indented-paragraph">' . esc_html__( 'Skateboarding can teach people discipline, patience, and resiliency. It’s a great sport for kids with a lot of energy! We’ll help build up some structure and support in your life, all while you meet new people and have a ton of fun learning how to skateboard.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:paragraph -->
+	<p>' . esc_html__( 'Skateboarding is a social sport! Come hang out and meet some new friends to cheer you on while you skate. We have a strict no-bullying policy and maintain a supportive environment for all camp attendees.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:paragraph -->
+	<p>' . esc_html__( 'Work 1:1 with our team of coaches to learn how to skate. They’ll be your mentors and guides while you’re at camp. Plus, many of our older campers will mentor the younger skaters.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+);

skatepark/sass/block-styles/_image-caption.scss

@@ -0,0 +1,25 @@
+.is-style-skatepark-aside-caption {
+	align-items: center;
+	display: flex;
+	flex-direction: column;
+
+	img {
+		justify-self: center;
+	}
+
+	figcaption {
+		align-self: flex-end;
+		border-top: 3px solid var(--wp--preset--color--primary);
+		font-size: var(--wp--preset--font-size--small);
+		margin-bottom: 0;
+		margin-top: 20px;
+		padding-top: 20px;
+		max-width: 455px;
+		text-align: left;
+	}
+
+	&.alignfull figcaption {
+		margin-left: var(--wp--custom--post-content--padding--left);
+		margin-right: calc( max( 0.5 * ( 100% - var(--wp--custom--layout--wide-size) ), var(--wp--custom--post-content--padding--left) ) );
+	}
+}

skatepark/sass/block-styles/_indented-paragraph.scss

@@ -0,0 +1,3 @@
+.is-style-indented-paragraph {
+	text-indent: 10em;
+}

skatepark/sass/blocks/_post-comments.scss

@@ -0,0 +1,107 @@
+@import "../../../blockbase/sass/blocks/button-mixins";
+
+.wp-block-post-comments {
+	.reply {
+		a {
+			--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+			@include button-border-styles;
+			--wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
+			--wp--custom--button--color--background: var(--wp--custom--button--color--background);
+			--wp--custom--button--border--color: var(--wp--custom--button--hover--color--text);
+
+			& ,
+			&:hover,
+			&:focus,
+			&:active {
+				line-height: 1;
+			}
+			&:not(.has-background):not(.has-text-color) {
+				&:hover,
+				&:focus,
+				&.has-focus {
+					--wp--custom--button--typography--font-size: var(--wp--preset--font-size--normal);
+					--wp--custom--button--color--text: var(--wp--custom--button--hover--color--background);
+					--wp--custom--button--color--background: var(--wp--custom--button--hover--color--text);
+				}
+			}
+		}
+	}
+
+	form {
+		column-gap: 1.2em;
+		grid-template-areas:
+			"notes notes"
+			"comment comment"
+			"author email"
+			"url url"
+			"cookies-consent cookies-consent"
+			"form-submit form-submit";
+
+		input:not([type=submit]):not([type=checkbox]),
+		textarea {
+			font-size: var(--wp--preset--font-size--normal);
+			width: 100%;
+		}
+
+		label:not([for=wp-comment-cookies-consent]) {
+			font-size: var(--wp--custom--form--label--typography--font-size);
+			font-weight: var(--wp--custom--form--label--typography--font-weight);
+			letter-spacing: var(--wp--custom--form--label--typography--letter-spacing);
+			margin-bottom: var(--wp--custom--form--label--spacing--margin--bottom);
+			text-transform: var(--wp--custom--form--label--typography--text-transform);
+		}
+
+		p {
+			margin-top: 0;
+			margin-bottom: 30px;
+		}
+
+		.comment-form-comment {
+			textarea {
+				vertical-align: top;
+			}
+		}
+
+		.comment-form-cookies-consent {
+			margin-bottom: var(--wp--custom--margin--vertical);
+		}
+	}
+
+	.comment-reply-title {
+		margin-bottom: 30px;
+	}
+
+	.comment-author {
+		margin-bottom: var(--wp--custom--margin--baseline);
+
+		cite {
+			font-weight: bold;
+		}
+
+		.says {
+			display: none;
+		}
+	}
+
+	.commentmetadata {
+		margin-bottom: 36px;
+
+		a {
+			font-weight: 500;
+		}
+	}
+
+	.commentlist {
+		margin-bottom: calc( 4 * var(--wp--custom--margin--baseline) );
+	}
+
+	// Target certain links within post comments to use the underline treatment.
+	.comment-body > p > a,
+	.comment-edit-link {
+		text-decoration: underline;
+
+		&:hover {
+			text-decoration: none;
+		}
+	}
+}

skatepark/sass/elements/_headings.scss

@@ -0,0 +1,8 @@
+h1, h2, h3, h4, h5, h6 {
+	&.is-style-skatepark-heading-border{
+		display: inline-block;
+		border-top: 2px solid var(--wp--custom--color--primary);
+		margin-bottom: 0;
+		padding-top: 1em;
+	}
+}

skatepark/sass/elements/_links.scss

@@ -12,6 +12,7 @@ a {
 	}
 }
 
+.wp-block-post-comments .comment-meta > a,
 .wp-block-post-comments .comment-body > p > a,
 .wp-block-post-comments .comment-edit-link {
 	text-decoration-line: underline;

skatepark/sass/theme.scss

@@ -2,8 +2,12 @@
 @import "../../blockbase/sass/base/mixins";
 @import "base/text";
 @import "blocks/buttons";
+@import "blocks/post-comments";
 @import "blocks/search";
+@import "block-styles/image-caption";
+@import "block-styles/indented-paragraph";
 @import "block-patterns/pre-footer";
 @import "block-patterns/testimonial";
+@import "elements/headings";
 @import "elements/links";
 @import "templates/header";

skatepark/theme.json

@@ -133,7 +133,6 @@
 					}
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)",
 					"fontSize": "16px",
 					"fontWeight": "700",
 					"lineHeight": 2
@@ -201,6 +200,31 @@
 					"style": "solid",
 					"width": "3px"
 				},
+				"checkbox": {
+					"checked": {
+						"content": "\"\\2715\"",
+						"fontSize": "var(--wp--preset--font-size--normal)",
+						"position": {
+							"left": "7px",
+							"top": "3px"
+						},
+						"sizing": {
+							"height": "25px",
+							"width": "25px"
+						}
+					},
+					"unchecked": {
+						"content": "\"\"",
+						"position": {
+							"left": "0",
+							"top": "-0.4em"
+						},
+						"sizing": {
+							"height": "30px",
+							"width": "30px"
+						}
+					}
+				},
 				"color": {
 					"background": "transparent",
 					"boxShadow": "none",
@@ -208,7 +232,15 @@
 				},
 				"label": {
 					"typography": {
-						"fontSize": "var(--wp--preset--font-size--tiny)"
+						"fontSize": "var(--wp--preset--font-size--tiny)",
+						"fontWeight": "900",
+						"letterSpacing": ".1em",
+						"textTransform": "uppercase"
+					},
+					"spacing": {
+						"margin": {
+							"bottom": "var(--wp--custom--margin--baseline)"
+						}
 					}
 				},
 				"typography": {
@@ -222,13 +254,11 @@
 			},
 			"body": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"lineHeight": 1.6
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "700",
 					"lineHeight": 1.125
 				}
@@ -241,7 +271,8 @@
 				}
 			},
 			"layout": {
-				"contentSize": "684px"
+				"contentSize": "684px",
+				"wideSize": "1194px"
 			},
 			"list": {
 				"spacing": {
@@ -259,7 +290,6 @@
 				"dropcap": {
 					"margin": ".1em .1em 0 0",
 					"typography": {
-						"fontFamily": "var(--wp--custom--body--typography--font-family)",
 						"fontSize": "110px",
 						"fontWeight": "400"
 					}
@@ -343,6 +373,7 @@
 		"spacing": {
 			"customPadding": true,
 			"units": [
+				"%",
 				"px",
 				"em",
 				"rem",
@@ -357,7 +388,8 @@
 				{
 					"fontFamily": "\"Red Hat Display\", sans-serif",
 					"slug": "red-hat-display",
-					"name": "Red Hat Display"
+					"name": "Red Hat Display",
+					"google": "family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900"
 				}
 			],
 			"fontSizes": [
@@ -405,11 +437,12 @@
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				"typography": {
-					"fontFamily": "var(--wp--custom--button--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)",
-					"letterSpacing": "0.1em"
+					"letterSpacing": "0.1em",
+					"textTransform": "uppercase"
 				}
 			},
 			"core/code": {
@@ -436,7 +469,7 @@
 			},
 			"core/post-title": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
@@ -475,7 +508,7 @@
 				"border": {
 					"color": "currentColor",
 					"style": "solid",
-					"width": "0 0 1px 0"
+					"width": "0 0 3px 0"
 				}
 			},
 			"core/site-title": {
@@ -510,7 +543,7 @@
 		"elements": {
 			"h1": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "700",
 					"lineHeight": 1.2,
 					"fontSize": "min(max(48px, 7vw), 72px)"
@@ -518,7 +551,7 @@
 			},
 			"h2": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.2,
 					"fontSize": "min(max(36px, 5vw), 64px)"
@@ -526,7 +559,7 @@
 			},
 			"h3": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"fontSize": "min(max(30px, 5vw), 48px)"
@@ -534,7 +567,7 @@
 			},
 			"h4": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"fontSize": "var(--wp--preset--font-size--small)",
@@ -544,7 +577,7 @@
 			},
 			"h5": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"fontSize": "var(--wp--preset--font-size--small)",
@@ -554,7 +587,7 @@
 			},
 			"h6": {
 				"typography": {
-					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
+					"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"fontSize": "var(--wp--preset--font-size--tiny)",
@@ -570,7 +603,7 @@
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
-			"fontFamily": "var(--wp--custom--body--typography--font-family)",
+			"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 			"fontSize": "var(--wp--preset--font-size--normal)",
 			"fontWeight": "400"
 		}