瀏覽代碼

Sunderland: Update theme and prepare for Dotorg submission (#7812)

* Changes from WordPress Playground

I made some adjustments to the theme: 

- Added image from theme screenshot license
- Rearranged spacings in the templates
- Did some fine-tuning in Global Styles, font size presets

* Use relative paths for image in home pattern

* Remove Helvetica as bundled font

* Use footer pattern in template part

---------

Co-authored-by: Sarah Norris <sarah@sekai.co.uk>
Beatriz Fialho 1 年之前
父節點
當前提交
46a907432a

二進制
sunderland/assets/fonts/helvetica_italic_400.ttf


二進制
sunderland/assets/fonts/helvetica_italic_700.ttf


二進制
sunderland/assets/fonts/helvetica_normal_400.ttf


二進制
sunderland/assets/fonts/helvetica_normal_700.ttf


+ 1 - 11
sunderland/parts/footer.html

@@ -1,11 +1 @@
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--80)"} -->
-<div style="height:var(--wp--preset--spacing--80)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-right:5vw;padding-left:5vw"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--preset--spacing--60)","bottom":"var(--wp--preset--spacing--60)"}}},"layout":{"type":"default"}} -->
-<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)"><!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem","textTransform":"uppercase"}}} -->
-<p class="has-text-align-left" style="font-size:0.8rem;text-transform:uppercase">Designed with <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- wp:pattern {"slug":"sunderland/footer"} /-->

+ 4 - 8
sunderland/parts/header.html

@@ -1,11 +1,7 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"3vh","right":"5vw","bottom":"3vh","left":"5vw"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-top:3vh;padding-right:5vw;padding-bottom:3vh;padding-left:5vw"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"0","top":"0","right":"0","left":"0"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:group {"layout":{"type":"flex"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"2rem"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:site-title {"fontSize":"large"} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"2vh","right":"5vw","bottom":"2vh","left":"5vw"}}},"backgroundColor":"base","layout":{"type":"default"}} -->
+<div class="wp-block-group has-base-background-color has-background" style="padding-top:2vh;padding-right:5vw;padding-bottom:2vh;padding-left:5vw"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"0","top":"0","right":"0","left":"0"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:site-title {"fontSize":"large"} /-->
 
-<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
+<!-- wp:navigation {"overlayBackgroundColor":"base","overlayTextColor":"contrast","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"1.4rem"}}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->

+ 15 - 19
sunderland/patterns/footer.php

@@ -11,23 +11,19 @@
 <div style="height:var(--wp--preset--spacing--80)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
-	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var(--wp--preset--spacing--60)","bottom":"var(--wp--preset--spacing--60)"}}}} -->
-	<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)">
-		<!-- wp:paragraph {"align":"center"} -->
-		<p class="has-text-align-center">
-            <?php
-                /* Translators: WordPress link. */
-                $wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'sunderland' ) ) . '" rel="nofollow">WordPress</a>';
-                echo sprintf(
-                    esc_html__( 'Designed with %1$s', 'sunderland' ),
-                    $wordpress_link
-                );
-            ?>
-        </p>
-		<!-- /wp:paragraph -->
-	</div>
-	<!-- /wp:group -->
-</div>
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-right:5vw;padding-left:5vw"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var(--wp--preset--spacing--60)","bottom":"var(--wp--preset--spacing--60)"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)"><!-- wp:paragraph {"align":"left","style":{"typography":{"fontSize":"0.8rem","textTransform":"uppercase"}}} -->
+<p class="has-text-align-left" style="font-size:0.8rem;text-transform:uppercase">
+    <?php
+        /* Translators: WordPress link. */
+        $wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'sunderland' ) ) . '" rel="nofollow">WordPress</a>';
+        echo sprintf(
+            esc_html__( 'Designed with %1$s', 'sunderland' ),
+            $wordpress_link
+        );
+    ?>
+</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->

+ 3 - 3
sunderland/patterns/home.php

@@ -6,8 +6,8 @@
  * Inserter: no
  */
 ?>
-<!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/summertime_image.webp","dimRatio":10,"overlayColor":"base","minHeight":100,"minHeightUnit":"vh","style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"textColor":"contrast","layout":{"type":"constrained"}} -->
-<div class="wp-block-cover has-contrast-color has-text-color" style="padding-right:5vw;padding-left:5vw;min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-base-background-color has-background-dim-10 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/summertime_image.webp" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:group {"align":"full","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"0vw","left":"0vw"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+<!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/summertime_image.webp","dimRatio":10,"overlayColor":"base","isUserOverlayColor":true,"minHeight":100,"minHeightUnit":"vh","lock":{"move":false,"remove":true},"style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"textColor":"contrast","layout":{"type":"default"}} -->
+<div class="wp-block-cover has-contrast-color has-text-color" style="padding-right:5vw;padding-left:5vw;min-height:100vh"><span aria-hidden="true" class="wp-block-cover__background has-base-background-color has-background-dim-10 has-background-dim"></span><img class="wp-block-cover__image-background" alt="<?php echo __('', 'sunderland');?>" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/summertime_image.webp" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:group {"align":"full","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"0vw","left":"0vw"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 <div class="wp-block-group alignfull" style="min-height:100vh;padding-right:0vw;padding-left:0vw"><!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"0px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -28,7 +28,7 @@
 
 <!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
 <div class="wp-block-group alignwide"><!-- wp:paragraph {"style":{"typography":{"textTransform":"uppercase","fontSize":"0.8rem"}}} -->
-<p style="font-size:0.8rem;text-transform:uppercase"><strong><?php echo esc_html__( 'in stores June 26th', 'sunderland' ); ?><br></strong><br><?php echo esc_html__( 'Release Party and exclusive pre-show cocktail reception', 'sunderland' ); ?><br><?php echo esc_html__( 'Eden Garden Amphitheater on June 25th', 'sunderland' ); ?><br><a href="/"><?php echo esc_html__( 'more info here', 'sunderland' ); ?></a><br></p>
+<p style="font-size:0.8rem;text-transform:uppercase"><?php echo __('<strong>in stores June 26th<br></strong><br>Release Party and exclusive pre-show cocktail reception<br>Eden Garden Amphitheater on June 25th<br><a href="/">more info here</a><br>', 'sunderland');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:social-links {"iconColor":"contrast","iconColorValue":"#ffd17b","size":"has-small-icon-size","style":{"spacing":{"blockGap":{"top":"1rem","left":"1rem"}}},"className":"is-style-logos-only"} -->

+ 7 - 5
sunderland/readme.txt

@@ -8,7 +8,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
 
-Sunderland is a simple WordPress event theme designed for announcing upcoming events in a visually captivating way. Sunderland's character lies in its immersive landing page, with an easily switchable full width background image. Sunderland is the ideal choice for bands, musicians, artists or event organizers who want a sleek and eye-catching website to inform and engage their audience.
+Sunderland is a simple WordPress event theme designed for announcing upcoming events in a visually captivating way. Sunderlands character lies in its immersive landing page, with an easily switchable full width background image. Sunderland is the ideal choice for bands, musicians, artists or event organizers who want a sleek and eye-catching website to inform and engage their audience.
 
 == Changelog ==
 
@@ -45,7 +45,9 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
-Helvetica Font
-© 1990-2006 Apple Computer Inc. © 1981 Linotype AG © 1990-91 Type Solutions Inc. 
-  
--- End of Helvetica Font credits --
+== Image used in theme screenshot ==
+
+Credit Tom Hubbard in The U.S. National Archives
+License: CC0 1.0 Universal (CC0 1.0)
+License URL: https://creativecommons.org/publicdomain/zero/1.0/
+Source: https://www.rawpixel.com/image/8799420/photo-image-plant-fire-public-domain

二進制
sunderland/screenshot.png


+ 1 - 1
sunderland/style.css

@@ -11,7 +11,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: sunderland
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
 
 Sunderland WordPress Theme, (C) 2022 Automattic, Inc.
 Sunderland is distributed under the terms of the GNU GPL.

+ 11 - 5
sunderland/templates/index.html

@@ -1,16 +1,22 @@
-<!-- wp:group {"style":{"position":{"type":"sticky","top":"0px"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:template-part {"slug":"header","tagName":"header"} /--></div>
+<!-- wp:group {"style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="padding-right:5vw;padding-left:5vw"><!-- wp:template-part {"slug":"header","tagName":"header","align":"full"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"10vh","bottom":"10vh","left":"5vw","right":"5vw"}}},"layout":{"type":"default"}} -->
 <div class="wp-block-group" style="padding-top:10vh;padding-right:5vw;padding-bottom:10vh;padding-left:5vw"><!-- wp:query {"queryId":1,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","layout":{"type":"constrained"}} -->
 <main class="wp-block-query"><!-- wp:post-template -->
 <!-- wp:group -->
-<div class="wp-block-group"><!-- wp:post-title {"isLink":true} /-->
+<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"0.7rem"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:template-part {"slug":"post-meta"} /-->
 
-<!-- wp:template-part {"slug":"post-meta"} /-->
+<!-- wp:post-title {"isLink":true} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:post-content /-->
 
-<!-- wp:post-content /--></div>
+<!-- wp:spacer {"height":"60px"} -->
+<div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
 <!-- /wp:group -->
 <!-- /wp:post-template -->
 

+ 7 - 5
sunderland/templates/page.html

@@ -2,14 +2,16 @@
 <div class="wp-block-group"><!-- wp:template-part {"slug":"header","tagName":"header"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":false},"style":{"spacing":{"padding":{"top":"10vh","bottom":"10vh","right":"5vw","left":"5vw"},"blockGap":"4rem"}}} -->
-<main class="wp-block-group" style="padding-top:10vh;padding-right:5vw;padding-bottom:10vh;padding-left:5vw"><!-- wp:post-title {"textAlign":"center"} /-->
+<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":true},"metadata":{"name":"Title and Featured Image"},"style":{"spacing":{"padding":{"top":"10vh","bottom":"0vh","right":"5vw","left":"5vw"},"blockGap":"2rem"}},"layout":{"type":"constrained"}} -->
+<main class="wp-block-group" style="padding-top:10vh;padding-right:5vw;padding-bottom:0vh;padding-left:5vw"><!-- wp:post-featured-image {"aspectRatio":"3/2","width":"","align":"center"} /-->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:post-featured-image {"aspectRatio":"3/2","width":"","align":"center"} /--></div>
+<!-- wp:post-title {"textAlign":"left"} /--></main>
 <!-- /wp:group -->
 
-<!-- wp:post-content {"lock":{"move":false,"remove":false},"style":{"typography":{"fontSize":"0.9rem","textTransform":"none","lineHeight":"1.4"}},"layout":{"type":"constrained","contentSize":"560px"}} /--></main>
+<!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Post Content"},"align":"full","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignfull" style="padding-right:5vw;padding-left:5vw"><!-- wp:post-content {"lock":{"move":true,"remove":true},"align":"full","style":{"typography":{"textTransform":"none"}},"layout":{"type":"constrained"}} /--></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

+ 53 - 5
sunderland/templates/single.html

@@ -2,18 +2,66 @@
 <div class="wp-block-group"><!-- wp:template-part {"slug":"header","tagName":"header"} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":false},"style":{"spacing":{"padding":{"top":"10vh","bottom":"10vh","right":"5vw","left":"5vw"},"blockGap":"5rem"}}} -->
-<main class="wp-block-group" style="padding-top:10vh;padding-right:5vw;padding-bottom:10vh;padding-left:5vw"><!-- wp:group {"style":{"spacing":{"blockGap":"1rem"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:post-title {"textAlign":"center"} /-->
+<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":true},"metadata":{"name":"Title and Featured Image"},"style":{"spacing":{"padding":{"top":"10vh","bottom":"2vh","right":"5vw","left":"5vw"},"blockGap":"2rem"}},"layout":{"type":"constrained"}} -->
+<main class="wp-block-group" style="padding-top:10vh;padding-right:5vw;padding-bottom:2vh;padding-left:5vw"><!-- wp:post-featured-image {"aspectRatio":"3/2","width":"","align":"center"} /-->
+
+<!-- wp:group {"style":{"spacing":{"blockGap":"0.6rem"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:post-title {"textAlign":"left"} /-->
 
 <!-- wp:template-part {"slug":"post-meta","align":"center"} /--></div>
+<!-- /wp:group --></main>
+<!-- /wp:group -->
+
+<!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"Post Content"},"align":"full","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"5vw","left":"5vw"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignfull" style="padding-right:5vw;padding-left:5vw"><!-- wp:post-content {"lock":{"move":true,"remove":true},"align":"full","style":{"typography":{"textTransform":"none"}},"layout":{"type":"constrained"}} /--></div>
+<!-- /wp:group --></div>
 <!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:post-featured-image {"aspectRatio":"3/2","width":"","align":"center"} /--></div>
+<div class="wp-block-group"><!-- wp:comments -->
+<div class="wp-block-comments"><!-- wp:spacer -->
+<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:comments-title /-->
+
+<!-- wp:comment-template -->
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"40px"} -->
+<div class="wp-block-column" style="flex-basis:40px"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"20px"}}} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:comment-author-name /-->
+
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date /-->
+
+<!-- wp:comment-edit-link /--></div>
 <!-- /wp:group -->
 
-<!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained","contentSize":"560px"}} /--></main>
+<!-- wp:comment-content /-->
+
+<!-- wp:comment-reply-link /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
+
+<!-- wp:comments-pagination {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:comments-pagination-previous /-->
+
+<!-- wp:comments-pagination-numbers /-->
+
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
+
+<!-- wp:spacer -->
+<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments --></div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

+ 62 - 727
sunderland/theme.json

@@ -1,672 +1,6 @@
 {
 	"settings": {
 		"appearanceTools": true,
-		"blocks": {
-			"core/button": {
-				"appearanceTools": true,
-				"color": {
-					"background": true,
-					"custom": true,
-					"customDuotone": true,
-					"customGradient": true,
-					"defaultDuotone": true,
-					"defaultGradients": true,
-					"defaultPalette": true,
-					"duotone": [],
-					"gradients": [],
-					"palette": [
-						{
-							"color": "#000000",
-							"name": "Base",
-							"slug": "base"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Contrast",
-							"slug": "contrast"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Primary",
-							"slug": "primary"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Secondary",
-							"slug": "secondary"
-						},
-						{
-							"color": "#161616",
-							"name": "Tertiary",
-							"slug": "tertiary"
-						}
-					],
-					"text": true
-				},
-				"layout": {
-					"contentSize": false,
-					"definitions": {
-						"constrained": {
-							"baseStyles": [
-								{
-									"rules": {
-										"float": "left",
-										"margin-inline-end": "2em",
-										"margin-inline-start": "0"
-									},
-									"selector": " > .alignleft"
-								},
-								{
-									"rules": {
-										"float": "right",
-										"margin-inline-end": "0",
-										"margin-inline-start": "2em"
-									},
-									"selector": " > .alignright"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important"
-									},
-									"selector": " > .aligncenter"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important",
-										"max-width": "var(--wp--style--global--content-size)"
-									},
-									"selector": " > :where(:not(.alignleft):not(.alignright):not(.alignfull))"
-								},
-								{
-									"rules": {
-										"max-width": "var(--wp--style--global--wide-size)"
-									},
-									"selector": " > .alignwide"
-								}
-							],
-							"className": "is-layout-constrained",
-							"name": "constrained",
-							"slug": "constrained",
-							"spacingStyles": [
-								{
-									"rules": {
-										"margin-block-start": "0"
-									},
-									"selector": " > :first-child:first-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0"
-									},
-									"selector": " > :last-child:last-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0",
-										"margin-block-start": null
-									},
-									"selector": " > *"
-								}
-							]
-						},
-						"default": {
-							"baseStyles": [
-								{
-									"rules": {
-										"float": "left",
-										"margin-inline-end": "2em",
-										"margin-inline-start": "0"
-									},
-									"selector": " > .alignleft"
-								},
-								{
-									"rules": {
-										"float": "right",
-										"margin-inline-end": "0",
-										"margin-inline-start": "2em"
-									},
-									"selector": " > .alignright"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important"
-									},
-									"selector": " > .aligncenter"
-								}
-							],
-							"className": "is-layout-flow",
-							"name": "default",
-							"slug": "flow",
-							"spacingStyles": [
-								{
-									"rules": {
-										"margin-block-start": "0"
-									},
-									"selector": " > :first-child:first-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0"
-									},
-									"selector": " > :last-child:last-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0",
-										"margin-block-start": null
-									},
-									"selector": " > *"
-								}
-							]
-						},
-						"flex": {
-							"baseStyles": [
-								{
-									"rules": {
-										"align-items": "center",
-										"flex-wrap": "wrap"
-									},
-									"selector": ""
-								},
-								{
-									"rules": {
-										"margin": "0"
-									},
-									"selector": " > *"
-								}
-							],
-							"className": "is-layout-flex",
-							"displayMode": "flex",
-							"name": "flex",
-							"slug": "flex",
-							"spacingStyles": [
-								{
-									"rules": {
-										"gap": null
-									},
-									"selector": ""
-								}
-							]
-						},
-						"grid": {
-							"baseStyles": [
-								{
-									"rules": {
-										"margin": "0"
-									},
-									"selector": " > *"
-								}
-							],
-							"className": "is-layout-grid",
-							"displayMode": "grid",
-							"name": "grid",
-							"slug": "grid",
-							"spacingStyles": [
-								{
-									"rules": {
-										"gap": null
-									},
-									"selector": ""
-								}
-							]
-						}
-					},
-					"wideSize": false
-				},
-				"shadow": {
-					"defaultPresets": true,
-					"presets": []
-				},
-				"spacing": {
-					"customSpacingSize": true,
-					"spacingScale": {
-						"increment": 1.5,
-						"mediumStep": 1.5,
-						"operator": "*",
-						"steps": 7,
-						"unit": "rem"
-					},
-					"spacingSizes": [],
-					"units": [
-						"%",
-						"px",
-						"em",
-						"rem",
-						"vh",
-						"vw"
-					]
-				},
-				"typography": {
-					"customFontSize": true,
-					"dropCap": true,
-					"fluid": true,
-					"fontFamilies": [
-						{
-							"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-							"name": "System Font",
-							"slug": "system-font"
-						},
-						{
-							"fontFace": [
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "normal",
-									"fontWeight": "700",
-									"src": [
-										"file:./assets/fonts/helvetica_normal_700.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "italic",
-									"fontWeight": "700",
-									"src": [
-										"file:./assets/fonts/helvetica_italic_700.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "normal",
-									"fontWeight": "400",
-									"src": [
-										"file:./assets/fonts/helvetica_normal_400.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "italic",
-									"fontWeight": "400",
-									"src": [
-										"file:./assets/fonts/helvetica_italic_400.ttf"
-									]
-								}
-							],
-							"fontFamily": "Helvetica",
-							"slug": "helvetica"
-						}
-					],
-					"fontSizes": [
-						{
-							"fluid": {
-								"max": "1.0625rem",
-								"min": "0.825rem"
-							},
-							"name": "Small",
-							"size": "1rem",
-							"slug": "small"
-						},
-						{
-							"fluid": {
-								"max": "1.25rem",
-								"min": "1rem"
-							},
-							"name": "Medium",
-							"size": "1.125rem",
-							"slug": "medium"
-						},
-						{
-							"fluid": {
-								"max": "2rem",
-								"min": "1.75rem"
-							},
-							"name": "Large",
-							"size": "1.75rem",
-							"slug": "large"
-						},
-						{
-							"fluid": {
-								"max": "3rem",
-								"min": "2.5rem"
-							},
-							"name": "Extra Large",
-							"size": "3rem",
-							"slug": "x-large"
-						}
-					],
-					"fontStyle": true,
-					"fontWeight": true,
-					"letterSpacing": true,
-					"textDecoration": true,
-					"textTransform": true
-				},
-				"useRootPaddingAwareAlignments": true
-			},
-			"core/navigation": {
-				"appearanceTools": true,
-				"color": {
-					"background": true,
-					"custom": true,
-					"customDuotone": true,
-					"customGradient": true,
-					"defaultDuotone": true,
-					"defaultGradients": true,
-					"defaultPalette": true,
-					"duotone": [],
-					"gradients": [],
-					"palette": [
-						{
-							"color": "#000000",
-							"name": "Base",
-							"slug": "base"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Contrast",
-							"slug": "contrast"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Primary",
-							"slug": "primary"
-						},
-						{
-							"color": "#ffd17b",
-							"name": "Secondary",
-							"slug": "secondary"
-						},
-						{
-							"color": "#161616",
-							"name": "Tertiary",
-							"slug": "tertiary"
-						}
-					],
-					"text": true
-				},
-				"layout": {
-					"contentSize": false,
-					"definitions": {
-						"constrained": {
-							"baseStyles": [
-								{
-									"rules": {
-										"float": "left",
-										"margin-inline-end": "2em",
-										"margin-inline-start": "0"
-									},
-									"selector": " > .alignleft"
-								},
-								{
-									"rules": {
-										"float": "right",
-										"margin-inline-end": "0",
-										"margin-inline-start": "2em"
-									},
-									"selector": " > .alignright"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important"
-									},
-									"selector": " > .aligncenter"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important",
-										"max-width": "var(--wp--style--global--content-size)"
-									},
-									"selector": " > :where(:not(.alignleft):not(.alignright):not(.alignfull))"
-								},
-								{
-									"rules": {
-										"max-width": "var(--wp--style--global--wide-size)"
-									},
-									"selector": " > .alignwide"
-								}
-							],
-							"className": "is-layout-constrained",
-							"name": "constrained",
-							"slug": "constrained",
-							"spacingStyles": [
-								{
-									"rules": {
-										"margin-block-start": "0"
-									},
-									"selector": " > :first-child:first-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0"
-									},
-									"selector": " > :last-child:last-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0",
-										"margin-block-start": null
-									},
-									"selector": " > *"
-								}
-							]
-						},
-						"default": {
-							"baseStyles": [
-								{
-									"rules": {
-										"float": "left",
-										"margin-inline-end": "2em",
-										"margin-inline-start": "0"
-									},
-									"selector": " > .alignleft"
-								},
-								{
-									"rules": {
-										"float": "right",
-										"margin-inline-end": "0",
-										"margin-inline-start": "2em"
-									},
-									"selector": " > .alignright"
-								},
-								{
-									"rules": {
-										"margin-left": "auto !important",
-										"margin-right": "auto !important"
-									},
-									"selector": " > .aligncenter"
-								}
-							],
-							"className": "is-layout-flow",
-							"name": "default",
-							"slug": "flow",
-							"spacingStyles": [
-								{
-									"rules": {
-										"margin-block-start": "0"
-									},
-									"selector": " > :first-child:first-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0"
-									},
-									"selector": " > :last-child:last-child"
-								},
-								{
-									"rules": {
-										"margin-block-end": "0",
-										"margin-block-start": null
-									},
-									"selector": " > *"
-								}
-							]
-						},
-						"flex": {
-							"baseStyles": [
-								{
-									"rules": {
-										"align-items": "center",
-										"flex-wrap": "wrap"
-									},
-									"selector": ""
-								},
-								{
-									"rules": {
-										"margin": "0"
-									},
-									"selector": " > *"
-								}
-							],
-							"className": "is-layout-flex",
-							"displayMode": "flex",
-							"name": "flex",
-							"slug": "flex",
-							"spacingStyles": [
-								{
-									"rules": {
-										"gap": null
-									},
-									"selector": ""
-								}
-							]
-						},
-						"grid": {
-							"baseStyles": [
-								{
-									"rules": {
-										"margin": "0"
-									},
-									"selector": " > *"
-								}
-							],
-							"className": "is-layout-grid",
-							"displayMode": "grid",
-							"name": "grid",
-							"slug": "grid",
-							"spacingStyles": [
-								{
-									"rules": {
-										"gap": null
-									},
-									"selector": ""
-								}
-							]
-						}
-					},
-					"wideSize": false
-				},
-				"shadow": {
-					"defaultPresets": true,
-					"presets": []
-				},
-				"spacing": {
-					"customSpacingSize": true,
-					"spacingScale": {
-						"increment": 1.5,
-						"mediumStep": 1.5,
-						"operator": "*",
-						"steps": 7,
-						"unit": "rem"
-					},
-					"spacingSizes": [],
-					"units": [
-						"%",
-						"px",
-						"em",
-						"rem",
-						"vh",
-						"vw"
-					]
-				},
-				"typography": {
-					"customFontSize": true,
-					"dropCap": true,
-					"fluid": true,
-					"fontFamilies": [
-						{
-							"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-							"name": "System Font",
-							"slug": "system-font"
-						},
-						{
-							"fontFace": [
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "normal",
-									"fontWeight": "700",
-									"src": [
-										"file:./assets/fonts/helvetica_normal_700.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "italic",
-									"fontWeight": "700",
-									"src": [
-										"file:./assets/fonts/helvetica_italic_700.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "normal",
-									"fontWeight": "400",
-									"src": [
-										"file:./assets/fonts/helvetica_normal_400.ttf"
-									]
-								},
-								{
-									"fontFamily": "Helvetica",
-									"fontStyle": "italic",
-									"fontWeight": "400",
-									"src": [
-										"file:./assets/fonts/helvetica_italic_400.ttf"
-									]
-								}
-							],
-							"fontFamily": "Helvetica",
-							"slug": "helvetica"
-						}
-					],
-					"fontSizes": [
-						{
-							"fluid": {
-								"max": "1.0625rem",
-								"min": "0.825rem"
-							},
-							"name": "Small",
-							"size": "1rem",
-							"slug": "small"
-						},
-						{
-							"fluid": {
-								"max": "1.25rem",
-								"min": "1rem"
-							},
-							"name": "Medium",
-							"size": "1.125rem",
-							"slug": "medium"
-						},
-						{
-							"fluid": {
-								"max": "2rem",
-								"min": "1.75rem"
-							},
-							"name": "Large",
-							"size": "1.75rem",
-							"slug": "large"
-						},
-						{
-							"fluid": {
-								"max": "3rem",
-								"min": "2.5rem"
-							},
-							"name": "Extra Large",
-							"size": "3rem",
-							"slug": "x-large"
-						}
-					],
-					"fontStyle": true,
-					"fontWeight": true,
-					"letterSpacing": true,
-					"textDecoration": true,
-					"textTransform": true
-				},
-				"useRootPaddingAwareAlignments": true
-			}
-		},
 		"color": {
 			"background": true,
 			"custom": true,
@@ -742,44 +76,6 @@
 					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
 					"name": "System Font",
 					"slug": "system-font"
-				},
-				{
-					"fontFace": [
-						{
-							"fontFamily": "Helvetica",
-							"fontStyle": "normal",
-							"fontWeight": "700",
-							"src": [
-								"file:./assets/fonts/helvetica_normal_700.ttf"
-							]
-						},
-						{
-							"fontFamily": "Helvetica",
-							"fontStyle": "italic",
-							"fontWeight": "700",
-							"src": [
-								"file:./assets/fonts/helvetica_italic_700.ttf"
-							]
-						},
-						{
-							"fontFamily": "Helvetica",
-							"fontStyle": "normal",
-							"fontWeight": "400",
-							"src": [
-								"file:./assets/fonts/helvetica_normal_400.ttf"
-							]
-						},
-						{
-							"fontFamily": "Helvetica",
-							"fontStyle": "italic",
-							"fontWeight": "400",
-							"src": [
-								"file:./assets/fonts/helvetica_italic_400.ttf"
-							]
-						}
-					],
-					"fontFamily": "Helvetica",
-					"slug": "helvetica"
 				}
 			],
 			"fontSizes": [
@@ -843,7 +139,7 @@
 						"style": "solid",
 						"width": "1px"
 					},
-					"radius": "0px",
+					"radius": "100px",
 					"right": {
 						"color": "#ffd17b",
 						"style": "solid",
@@ -872,11 +168,30 @@
 			},
 			"core/code": {
 				"border": {
+					"bottom": {
+						"style": "none",
+						"width": "0px"
+					},
 					"color": "var(--wp--preset--color--contrast)",
+					"left": {
+						"style": "none",
+						"width": "0px"
+					},
 					"radius": "0.25rem",
+					"right": {
+						"style": "none",
+						"width": "0px"
+					},
 					"style": "solid",
+					"top": {
+						"style": "none",
+						"width": "0px"
+					},
 					"width": "2px"
 				},
+				"color": {
+					"background": "var(--wp--preset--color--tertiary)"
+				},
 				"spacing": {
 					"padding": {
 						"bottom": "var(--wp--preset--spacing--50)",
@@ -915,6 +230,11 @@
 					"textTransform": "uppercase"
 				}
 			},
+			"core/comments-title": {
+				"typography": {
+					"textTransform": "uppercase"
+				}
+			},
 			"core/gallery": {
 				"spacing": {
 					"margin": {
@@ -960,6 +280,7 @@
 			},
 			"core/paragraph": {
 				"typography": {
+					"lineHeight": "1.4",
 					"textTransform": "none"
 				}
 			},
@@ -985,6 +306,7 @@
 			},
 			"core/post-content": {
 				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"textTransform": "none"
 				}
 			},
@@ -1005,7 +327,8 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "0.8rem",
+					"textTransform": "uppercase"
 				}
 			},
 			"core/post-terms": {
@@ -1020,6 +343,10 @@
 							"textDecoration": "none"
 						}
 					}
+				},
+				"typography": {
+					"fontSize": "0.8rem",
+					"textTransform": "uppercase"
 				}
 			},
 			"core/post-title": {
@@ -1041,6 +368,7 @@
 					}
 				},
 				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"textTransform": "uppercase"
 				}
 			},
@@ -1067,22 +395,23 @@
 					"width": "1px 0"
 				},
 				"color": {
-					"background": "var(--wp--preset--color--contrast)",
-					"text": "var(--wp--preset--color--base)"
+					"background": "var(--wp--preset--color--base)",
+					"text": "var(--wp--preset--color--contrast)"
 				},
+				"css": "text-align: left;",
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var(--wp--preset--color--base)"
+							"text": "var(--wp--preset--color--contrast)"
 						}
 					}
 				},
 				"spacing": {
 					"padding": {
-						"bottom": "var(--wp--preset--spacing--50)",
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)",
-						"top": "var(--wp--preset--spacing--50)"
+						"bottom": "2rem",
+						"left": "0rem",
+						"right": "0rem",
+						"top": "2rem"
 					}
 				},
 				"typography": {
@@ -1094,6 +423,12 @@
 					"textTransform": "uppercase"
 				}
 			},
+			"core/query-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"textTransform": "uppercase"
+				}
+			},
 			"core/quote": {
 				"border": {
 					"color": "var(--wp--preset--color--primary)",
@@ -1161,7 +496,7 @@
 			"background": "var(--wp--preset--color--base)",
 			"text": "var(--wp--preset--color--contrast)"
 		},
-		"css": "a:any-link {\n    text-decoration-thickness: .01em !important;\n    text-underline-offset: .20em;\n}\na:where(:not(.wp-element-button)):hover {\n    text-decoration: none;\n}",
+		"css": "a:any-link {\n    text-decoration-thickness: .01em !important;\n    text-underline-offset: .20em;\n}\na:where(:not(.wp-element-button)):hover {\n    text-decoration: none;\n}\n\n.wp-block-post-comments-form .comment-form input:not([type=\"submit\"]):not([type=\"checkbox\"]):not([type=\"hidden\"]), .wp-block-post-comments-form .comment-form textarea {\n\tbackground-color: #161616;\n\tborder-radius: 3px;\n\tborder-color: #424242;\n\tcolor: #424242;\n}",
 		"elements": {
 			"button": {
 				":active": {
@@ -1208,32 +543,32 @@
 			},
 			"h2": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontSize": "1.6rem"
 				}
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 0.4808)), 1.75rem)"
+					"fontSize": "1.4rem"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "clamp(1.25rem, calc(1.25rem + ((1vw - 0.48rem) * 0.4808)), 1.5rem)"
+					"fontSize": "1.2rem"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "1rem"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "0.8rem"
 				}
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--helvetica)",
+					"fontFamily": "var(--wp--preset--font-family--system-font)",
 					"fontStyle": "normal",
 					"fontWeight": "700",
 					"lineHeight": "1.125"
@@ -1251,17 +586,17 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "1.5rem",
+			"blockGap": "2rem",
 			"padding": {
 				"bottom": "0rem",
-				"left": "0rem",
-				"right": "0rem",
+				"left": "5vw",
+				"right": "5vw",
 				"top": "0rem"
 			}
 		},
 		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--helvetica)",
-			"fontSize": "0.8rem",
+			"fontFamily": "var(--wp--preset--font-family--system-font)",
+			"fontSize": "var(--wp--preset--font-size--small)",
 			"lineHeight": "1.6"
 		}
 	},
@@ -1276,5 +611,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/trunk/theme.json"
-}
+	"$schema": "https://schemas.wp.org/wp/6.5/theme.json"
+}