Exmoor: updates for the theme review (#7628)

exmoor/functions.php

@@ -8,6 +8,7 @@
  * @since Exmoor 1.0
  */
 
+declare( strict_types = 1 );
 
 if ( ! function_exists( 'exmoor_support' ) ) :
 

exmoor/patterns/404.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/404
  * Inserter: no
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:heading {"textAlign":"left","level":1,"fontSize":"medium","anchor":"oops-that-page-can-t-be-found"} -->
 <h1 class="wp-block-heading has-text-align-left has-medium-font-size" id="oops-that-page-can-t-be-found"><?php echo esc_html__( 'Oops! That page can’t be found.', 'exmoor' ); ?></h1>
 <!-- /wp:heading -->

exmoor/patterns/call-to-action.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/call-to-action
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"8vw","bottom":"8vw","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"secondary","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull has-secondary-background-color has-background" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:heading {"textAlign":"center","level":3,"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} -->

exmoor/patterns/footer.php

@@ -5,7 +5,10 @@
  * Categories: footer
  * Block Types: core/template-part/footer
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"8vw","right":"var:preset|spacing|60","bottom":"8vw","left":"var:preset|spacing|60"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"contrast","textColor":"base","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:columns {"align":"wide"} -->

exmoor/patterns/front-page.php

@@ -5,6 +5,8 @@
  * Categories: hidden
  * Inserter: no
  */
+
+declare( strict_types = 1 );
 ?>
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"1.5rem"}},"layout":{"type":"constrained"}} -->

exmoor/patterns/header.php

@@ -5,14 +5,17 @@
  * Categories: header
  * Block Types: core/template-part/header
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignwide">
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"textColor":"contrast","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"stretch"}} -->
 	<div class="wp-block-group alignwide has-contrast-color has-text-color" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
 		<!-- wp:site-title /-->
 
-		<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"top"}} -->
+		<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"center"}} -->
 		<div class="wp-block-group">
 			<!-- wp:navigation {"style":{"spacing":{"blockGap":"var:preset|spacing|50"},"typography":{"fontStyle":"normal","fontWeight":"500"}}} /-->
 

exmoor/patterns/heading-paragraph-four-columns.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/heading-paragraph-four-columns
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"8vw","bottom":"8vw","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"secondary","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull has-secondary-background-color has-background" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained","justifyContent":"left"}} -->

exmoor/patterns/heading-table.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/heading-table
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"8vw","bottom":"8vw","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained","justifyContent":"left"}} -->

exmoor/patterns/hero.php

@@ -4,6 +4,8 @@
  * Slug: exmoor/hero
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
 
 <!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/StockSnap_K6K80SHQJO-cropped.jpg","dimRatio":0,"focalPoint":{"x":0.7,"y":1},"minHeight":480,"minHeightUnit":"px","contentPosition":"center center","align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","bottom":"8vw","top":"8vw"}}}} -->

exmoor/patterns/masthead.php

@@ -4,6 +4,8 @@
  * Slug: exmoor/masthead
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
 
 <!-- wp:group {"align":"wide","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"layout":{"type":"constrained"}} -->
@@ -16,8 +18,8 @@
 	<div class="wp-block-columns alignwide are-vertically-aligned-bottom">
 		<!-- wp:column {"verticalAlignment":"bottom","width":"72%"} -->
 		<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:72%">
-			<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"lineHeight":"0.8","textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"huge","fontFamily":"raleway"} -->
-			<h1 class="wp-block-heading alignwide has-raleway-font-family has-huge-font-size" style="font-style:normal;font-weight:900;line-height:0.8;text-transform:uppercase"><?php echo wp_kses_post( __( 'Your<br>journey<br>begins', 'exmoor' ) ); ?></h1>
+			<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"lineHeight":"0.8","textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"xxxx-large","fontFamily":"raleway"} -->
+			<h1 class="wp-block-heading alignwide has-raleway-font-family has-xxxx-large-font-size" style="font-style:normal;font-weight:900;line-height:0.8;text-transform:uppercase"><?php echo wp_kses_post( __( 'Your<br>journey<br>begins', 'exmoor' ) ); ?></h1>
 			<!-- /wp:heading -->
 		</div>
 		<!-- /wp:column -->

exmoor/patterns/no-results-content.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/no-results-content
  * Inserter: no
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:paragraph -->
 <p><?php echo esc_html_x( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'Message explaining that there are no results returned from a search', 'exmoor' ); ?></p>
 <!-- /wp:paragraph -->

exmoor/patterns/paragraph.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/paragraph
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"top":"8vw","bottom":"8vw","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:group {"align":"wide","layout":{"type":"constrained","justifyContent":"right"}} -->

exmoor/patterns/search.php

@@ -4,6 +4,8 @@
  * Slug: exmoor/search
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
 
 <!-- wp:search {"label":"","showLabel":false,"placeholder":"<?php echo esc_html_x( 'Search...', 'This is a placeholder text in a search field', 'exmoor' ); ?>","buttonPosition":"button-inside","buttonUseIcon":true} /-->

exmoor/patterns/small-heading-quote.php

@@ -4,7 +4,10 @@
  * Slug: exmoor/small-heading-quote
  * Categories: featured
  */
+
+declare( strict_types = 1 );
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"8vw","right":"var:preset|spacing|60","bottom":"8vw","left":"var:preset|spacing|60"},"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"contrast","textColor":"base","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull has-base-color has-contrast-background-color has-text-color has-background" style="margin-top:0;margin-bottom:0;padding-top:8vw;padding-right:var(--wp--preset--spacing--60);padding-bottom:8vw;padding-left:var(--wp--preset--spacing--60)">
 	<!-- wp:columns {"align":"wide"} -->

exmoor/readme.txt

@@ -1,7 +1,7 @@
 === Exmoor ===
 Contributors: Automattic
 Requires at least: 6.0
-Tested up to: 6.2
+Tested up to: 6.4
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

exmoor/style.css

@@ -5,16 +5,28 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Exmoor is a business theme
 Requires at least: 6.0
-Tested up to: 6.2
+Tested up to: 6.4
 Requires PHP: 5.7
 Version: 1.0.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: exmoor
-Tags: blog, holiday, one-column, two-columns, wide-blocks, block-patterns, custom-background, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, template-editing, threaded-comments, translation-ready, style-variations
+Tags: holiday, one-column, wide-blocks, block-patterns,featured-images, full-site-editing, rtl-language-support, threaded-comments, translation-ready, style-variations
 Status: inactive
 */
 
+/*
+ * Button Block
+ * Control the hover stylings of outline block style.
+ * Unnecessary once block styles are configurable via theme.json
+ * https://github.com/WordPress/gutenberg/issues/42794
+ */
+.wp-block-button.is-style-outline>.wp-block-button__link:not(.has-background):hover {
+	background-color: var(--wp--preset--color--primary);
+	color: var(--wp--preset--color--base);
+	border-color: var(--wp--preset--color--primary);
+}
+
 /*
  * Link styles
  * https://github.com/WordPress/gutenberg/issues/42319
@@ -25,25 +37,12 @@ a {
 }
 
 /*
- * Avatar Block
- * Fix border radius setting for the avatar block
- * https://github.com/WordPress/gutenberg/issues/48253
+ * Navigation Block
+ * Reset the padding from List block
+ * https://github.com/WordPress/gutenberg/issues/50486
  */
-.wp-block-avatar a,
-.wp-block-avatar img {
-	border-radius: inherit;
-}
-
-/*
- * Button Block
- * Control the hover stylings of outline block style.
- * Unnecessary once block styles are configurable via theme.json
- * https://github.com/WordPress/gutenberg/issues/42794
- */
-.wp-block-button.is-style-outline>.wp-block-button__link:not(.has-background):hover {
-	background-color: var(--wp--preset--color--primary);
-	color: var(--wp--preset--color--base);
-	border-color: var(--wp--preset--color--primary);
+.wp-block-navigation ul {
+	padding: unset;
 }
 
 /*

exmoor/theme.json

@@ -6,9 +6,9 @@
 			"custom": true,
 			"customDuotone": true,
 			"customGradient": true,
-			"defaultDuotone": true,
-			"defaultGradients": true,
-			"defaultPalette": true,
+			"defaultDuotone": false,
+			"defaultGradients": false,
+			"defaultPalette": false,
 			"duotone": [],
 			"gradients": [],
 			"palette": [
@@ -51,11 +51,7 @@
 		"spacing": {
 			"customSpacingSize": true,
 			"spacingScale": {
-				"increment": 1.5,
-				"mediumStep": 1.5,
-				"operator": "*",
-				"steps": 7,
-				"unit": "rem"
+				"steps": 0
 			},
 			"spacingSizes": [
 				{
@@ -406,9 +402,9 @@
 						"max": "6.966rem",
 						"min": "3.359rem"
 					},
-					"name": "Huge",
+					"name": "Quadruple Extra Large",
 					"size": "6.966rem",
-					"slug": "huge"
+					"slug": "xxxx-large"
 				}
 			],
 			"fontStyle": true,
@@ -443,9 +439,6 @@
 			"core/avatar": {
 				"border": {
 					"radius": "999px"
-				},
-				"typography": {
-					"lineHeight": "0"
 				}
 			},
 			"core/button": {
@@ -453,10 +446,10 @@
 					"outline": {
 						"spacing": {
 							"padding": {
-								"bottom": "15px",
-								"left": "32px",
-								"right": "32px",
-								"top": "15px"
+								"bottom": "calc(1.0625rem - 2px)",
+								"left": "calc(2.125rem - 2px)",
+								"right": "calc(2.125rem - 2px)",
+								"top": "calc(1.0625rem - 2px)"
 							}
 						}
 					}
@@ -468,13 +461,16 @@
 				}
 			},
 			"core/calendar": {
-				"css": ".wp-block-calendar table:where(:not(.has-text-color)) {color: var(--wp--preset--color--contrast);} .wp-block-calendar table:where(:not(.has-text-color)) td,.wp-block-calendar table:where(:not(.has-text-color)) th {border-color: var(--wp--preset--color--contrast);}:where(.wp-block-calendar table:not(.has-background) th) {background-color: var(--wp--preset--color--contrast);color: var(--wp--preset--color--base);}",
+				"css": ".wp-block-calendar table:where(:not(.has-text-color)) {color: var(--wp--preset--color--contrast);} &.wp-block-calendar table:where(:not(.has-text-color)) td {border-color: var(--wp--preset--color--tertiary);} &.wp-block-calendar table:where(:not(.has-text-color)) th {border-color: var(--wp--preset--color--tertiary);} & :where(.wp-block-calendar table:not(.has-background) th) {background-color: var(--wp--preset--color--contrast);color: var(--wp--preset--color--base);}",
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--contrast)"
+							"typography": {
+								"textDecoration": "underline"
 							}
+						},
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				}
@@ -523,16 +519,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -545,6 +535,7 @@
 				}
 			},
 			"core/comment-content": {
+				"css": "& p{margin-bottom:0;} & p+p{margin-top:var(--wp--preset--spacing--50)}",
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--raleway)",
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -554,16 +545,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -578,16 +563,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -599,18 +578,23 @@
 				}
 			},
 			"core/comment-reply-link": {
+				"css":".wp-block-comment-reply-link a:where(:not(.wp-element-button)){display:inline-block;}",
 				"color": {
 					"text": "var(--wp--preset--color--contrast)"
 				},
 				"elements": {
 					"link": {
 						":hover": {
+							"border": {
+								"color": "var(--wp--preset--color--contrast)"
+							},
 							"color": {
-								"text": "var(--wp--preset--color--primary)"
+								"background": "var(--wp--preset--color--contrast)",
+								"text": "var(--wp--preset--color--base)"
 							}
 						},
 						"border": {
-							"color": "var(--wp--preset--color--tertiary)",
+							"color": "var(--wp--preset--color--secondary)",
 							"radius": "4px",
 							"style": "solid",
 							"width": "0"
@@ -620,10 +604,11 @@
 							"text": "var(--wp--preset--color--contrast)"
 						},
 						"spacing": {
-							"padding": "6px 12px"
+							"padding": "0.4375rem 0.75rem"
 						},
 						"typography": {
 							"fontSize": "var(--wp--preset--font-size--x-small)",
+							"lineHeight": "1",
 							"textDecoration": "none"
 						}
 					}
@@ -638,11 +623,17 @@
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var(--wp--preset--color--primary)"
+								"text": "var(--wp--preset--color--contrast)"
+							},
+							"typography": {
+								"textDecoration": "underline"
 							}
 						},
 						"color": {
-							"text": "var(--wp--preset--color--contrast)"
+							"text": "var(--wp--preset--color--primary)"
+						},
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				},
@@ -654,7 +645,8 @@
 			"core/comments-title": {
 				"spacing": {
 					"margin": {
-						"top": "0px"
+						"bottom": "0",
+						"top": "var(--wp--preset--spacing--50)"
 					}
 				},
 				"typography": {
@@ -678,7 +670,19 @@
 				"css": " .wp-element-caption{text-align:center;}"
 			},
 			"core/latest-comments": {
-				"css": " .wp-block-latest-comments__comment-date {font-size: var(--wp--preset--font-size--x-small);}.wp-block-latest-comments__comment-excerpt p{font-size: var(--wp--preset--font-size--small);}.wp-block-latest-comments__comment-excerpt p{margin:0 0 var(--wp--preset--spacing--50)}",
+				"css": "& .wp-block-latest-comments__comment-meta{font-size: inherit;} & .wp-block-latest-comments__comment-date{font-size: inherit;} & .wp-block-latest-comments__comment-excerpt p{font-size: inherit;} & .wp-block-latest-comments__comment-excerpt p{margin:0 0 var(--wp--style--block-gap)} &:where(.wp-block-latest-comments:not([style*=line-height] .wp-block-latest-comments__comment-excerpt p)){line-height:calc(1em + 0.625rem);}",
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				},
 				"spacing": {
 					"padding": {
 						"left": "0px"
@@ -686,16 +690,16 @@
 				}
 			},
 			"core/latest-posts": {
-				"css": " .wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date {font-size: var(--wp--preset--font-size--x-small);}.wp-block-latest-posts__post-excerpt{margin:var(--wp--preset--spacing--40) 0 var(--wp--preset--spacing--50)}",
+				"css": " .wp-block-latest-posts__post-author{font-size: inherit;} & .wp-block-latest-posts__post-date{font-size: inherit;} & .wp-block-latest-posts__post-excerpt{margin:0 0 var(--wp--style--block-gap)}",
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
+							"typography": {
+								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				}
@@ -708,6 +712,7 @@
 				}
 			},
 			"core/navigation": {
+				"css": "& .wp-block-navigation__responsive-container.is-menu-open .wp-block-navigation__responsive-container-content .wp-block-navigation__submenu-container{padding-top:0;} & .wp-block-navigation__responsive-container.is-menu-open{padding:var(--wp--style--block-gap);}",
 				"elements": {
 					"link": {
 						"typography": {
@@ -734,6 +739,11 @@
 							"textDecoration": "none"
 						}
 					}
+				},
+				"spacing": {
+					"padding": {
+						"left": "var(--wp--preset--spacing--40)"
+					}
 				}
 			},
 			"core/paragraph": {
@@ -747,54 +757,19 @@
 				}
 			},
 			"core/post-author": {
-				"css": ".wp-block-post-author .wp-block-post-author__byline{font-size:0.7em;} .wp-block-post-author .wp-block-post-author__bio {font-size:inherit;} .wp-block-post-author__avatar img {vertical-align:middle;} .wp-block-post-author__bio {margin:0;} .wp-block-post-author__avatar img {border-radius: 999px;}",
-				"elements": {
-					"link": {
-						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							}
-						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						}
-					}
-				},
+				"css": "& .wp-block-post-author__byline{font-size:inherit;}&.wp-block-post-author .wp-block-post-author__name a{text-decoration:none;}&.wp-block-post-author .wp-block-post-author__bio{font-size:inherit;margin:0;}& .wp-block-post-author__avatar img{border-radius: 999px;vertical-align:middle;}",
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/post-author-biography": {
-				"elements": {
-					"link": {
-						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--tertiary)"
-							}
-						},
-						"color": {
-							"text": "var(--wp--preset--color--primary)"
-						}
-					}
-				}
-			},
 			"core/post-author-name": {
-				"color": {
-					"text": "var(--wp--preset--color--contrast)"
-				},
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -809,16 +784,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -836,16 +805,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -860,16 +823,10 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
 							"textDecoration": "none"
 						}
@@ -887,12 +844,12 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
+							"typography": {
+								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				},
@@ -905,18 +862,11 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
-							},
 							"typography": {
 								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
-						},
 						"typography": {
-							"fontFamily": "var(--wp--preset--font-family--raleway)",
 							"textDecoration": "none"
 						}
 					}
@@ -928,13 +878,11 @@
 			},
 			"core/post-time-to-read": {
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--raleway)",
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/post-title": {
-				"color": {
-					"text": "var(--wp--preset--color--contrast)"
-				},
 				"elements": {
 					"link": {
 						":hover": {
@@ -978,12 +926,12 @@
 				"elements": {
 					"link": {
 						":hover": {
-							"color": {
-								"text": "var(--wp--preset--color--primary)"
+							"typography": {
+								"textDecoration": "underline"
 							}
 						},
-						"color": {
-							"text": "var(--wp--preset--color--contrast)"
+						"typography": {
+							"textDecoration": "none"
 						}
 					}
 				},
@@ -992,9 +940,19 @@
 					"fontStyle": "italic"
 				}
 			},
+			"core/query-pagination-next": {
+				"css": ".wp-block-query-pagination-next{margin:0;}"
+			},
+			"core/query-pagination-numbers": {
+				"css": ".wp-block-query-pagination-numbers{margin:0;}"
+			},
+			"core/query-pagination-previous": {
+				"css": ".wp-block-query-pagination-previous{margin:0;}"
+			},
 			"core/query-title": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"lineHeight": "1.3"
 				}
 			},
 			"core/quote": {
@@ -1049,9 +1007,9 @@
 					"button": {
 						"spacing": {
 							"margin": {
-								"left": "8px"
+								"left": "0.5rem"
 							},
-							"padding": "12px 16px"
+							"padding": "0.75rem"
 						}
 					}
 				},
@@ -1115,7 +1073,7 @@
 				}
 			},
 			"core/table": {
-				"css": " thead{border-bottom-width: 1px;} .wp-block-table tfoot{border-top-width: 1px;} .wp-block-table .wp-element-caption{text-align:center;}"
+				"css": "& thead{border-bottom-width: 1px;} & tfoot{border-top-width: 1px;} & + .wp-element-caption{text-align:center;}"
 			},
 			"core/table-of-contents": {
 				"elements": {
@@ -1132,13 +1090,13 @@
 				}
 			},
 			"core/tag-cloud": {
-				"css": ".wp-block-tag-cloud.is-style-outline a {border-radius: 999px; padding: 0 1rem;} .wp-block-tag-cloud.is-style-outline a:hover {color: var(--wp--preset--color--base); background-color: var(--wp--preset--color--contrast);}",
+				"css": ".wp-block-tag-cloud.is-style-outline{font-size:var(--wp--preset--font-size--small);line-height:1} &.wp-block-tag-cloud.is-style-outline a {border-radius:999px;padding: 0.25rem 0.75rem;} &.wp-block-tag-cloud.is-style-outline a:hover {color: var(--wp--preset--color--base);background-color: var(--wp--preset--color--contrast);}",
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--raleway)"
 				}
 			},
 			"core/term-description": {
-				"css": ".wp-block-term-description p:first-child {margin-top: 0;} .wp-block-term-description p:last-child {margin-bottom: 0;}",
+				"css": "& p+p {margin-top:calc(1em + 0.625rem);}",
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
@@ -1183,10 +1141,10 @@
 				},
 				"spacing": {
 					"padding": {
-						"bottom": "17px",
-						"left": "34px",
-						"right": "34px",
-						"top": "17px"
+						"bottom": "1.0625rem",
+						"left": "2.125rem",
+						"right": "2.125rem",
+						"top": "1.0625rem"
 					}
 				},
 				"typography": {
@@ -1205,6 +1163,10 @@
 					"margin": {
 						"bottom": "var(--wp--preset--spacing--50)",
 						"top": "var(--wp--preset--spacing--30)"
+					},
+					"padding": {
+						"left": "var(--wp--preset--spacing--50)",
+						"right": "var(--wp--preset--spacing--50)"
 					}
 				},
 				"typography": {
@@ -1266,10 +1228,10 @@
 		"spacing": {
 			"blockGap": "var(--wp--preset--spacing--50)",
 			"padding": {
-				"bottom": "0",
+				"bottom": "0px",
 				"left": "var(--wp--preset--spacing--60)",
 				"right": "var(--wp--preset--spacing--60)",
-				"top": "0"
+				"top": "0px"
 			}
 		},
 		"typography": {
@@ -1280,20 +1242,24 @@
 	},
 	"templateParts": [
 		{
-			"area": "comments",
-			"name": "comments"
+			"area": "uncategorized",
+			"name": "comments",
+			"title": "Comments"
 		},
 		{
 			"area": "header",
-			"name": "header"
+			"name": "header",
+			"title": "Header"
 		},
 		{
 			"area": "footer",
-			"name": "footer"
+			"name": "footer",
+			"title": "Footer"
 		},
 		{
-			"area": "post-meta",
-			"name": "post-meta"
+			"area": "uncategorized",
+			"name": "post-meta",
+			"title": "Post Meta"
 		}
 	],
 	"version": 2,