Bysshe: Cleanup (#8450)

* Cleanup
Automattic · Nov 22, 2024 · 9e35482 · 9e35482
1 parent 08c515b
commit 9e35482
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 210 deletions.
diff --git a/bysshe/patterns/404.php b/bysshe/patterns/404.php
@@ -2,7 +2,6 @@
 /**
  * Title: 404
  * Slug: bysshe/404
- * Categories: hidden
  * Inserter: no
  */
 ?>
@@ -11,7 +10,7 @@
 <header class="wp-block-group"><!-- wp:site-title {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
 <!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph --></header>
 <!-- /wp:group -->
 
@@ -20,14 +19,14 @@
 <!-- /wp:spacer -->
 
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
-<main class="wp-block-group"><!-- wp:columns -->
+<main class="wp-block-group"><!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"0","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns"><!-- wp:column {"width":"40%"} -->
 <div class="wp-block-column" style="flex-basis:40%"></div>
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"","style":{"spacing":{"padding":{"right":"var:preset|spacing|80"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--80)"><!-- wp:heading {"style":{"typography":{"textTransform":"lowercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"medium"} -->
-<h2 class="wp-block-heading has-medium-font-size" style="font-style:normal;font-weight:400;text-transform:lowercase"><?php echo esc_html_e('Oops, we lost you...', 'bysshe');?></h2>
+<h2 class="wp-block-heading has-medium-font-size" style="font-style:normal;font-weight:400;text-transform:lowercase"><?php esc_html_e('Oops, we lost you...', 'bysshe');?></h2>
 <!-- /wp:heading -->
 
 <!-- wp:spacer {"height":"50px","style":{"layout":[]}} -->
@@ -45,18 +44,12 @@
 
 <!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
 <footer class="wp-block-group"><!-- wp:paragraph {"align":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
-<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php echo esc_html_x('• •', 'Decorative symbols', 'bysshe');?></p>
+<p class="has-text-align-right has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph {"className":"no-underline","style":{"typography":{"lineHeight":"1.3","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"xxx-small"} -->
-<p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php
-	/* Translators: WordPress link. */
-	$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'bysshe' ) ) . '" rel="nofollow">WordPress</a>';
-	echo sprintf(
-		esc_html__( 'Designed with %1$s', 'bysshe' ),
-		$wordpress_link
-	);
-?></p>
+<p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
+echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
 <!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/bysshe/patterns/archive.php b/bysshe/patterns/archive.php
@@ -5,8 +5,8 @@
  * Inserter: no
  */
 ?>
-<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|80","right":"var:preset|spacing|80","bottom":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
-<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:columns {"verticalAlignment":null,"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->
+<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80","top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
+<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--80);padding-right:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:columns {"style":{"layout":{"selfStretch":"fill","flexSize":null},"spacing":{"blockGap":{"top":"0","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"stretch","width":"45%"} -->
 <div class="wp-block-column is-vertically-aligned-stretch" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 <div class="wp-block-group" style="min-height:100%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
@@ -49,36 +49,42 @@
 
 <!-- wp:column {"width":"45%"} -->
 <div class="wp-block-column" style="flex-basis:45%"><!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
+<div class="wp-block-group" style="min-height:100%"><!-- wp:group {"tagName":"header","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<header class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} -->
 <p class="has-xxx-small-font-size" style="line-height:1.3"><?php esc_html_e('• •', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></div>
+<!-- wp:site-title {"textAlign":"right","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /--></header>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|80","left":"var:preset|spacing|80"}},"layout":{"selfStretch":"fill","flexSize":null},"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"center"}} -->
+<div class="wp-block-group" style="min-height:100%;padding-right:var(--wp--preset--spacing--80);padding-left:var(--wp--preset--spacing--80)"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
 <p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Poetry, in a general sense, may be defined to be “the expression of the imagination”: and poetry is connate with the origin of man.', 'bysshe');?></p>
 <!-- /wp:paragraph -->
 
-<!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
-<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"40px","selfStretch":"fixed"}}} -->
+<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:query {"queryId":10,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-<div class="wp-block-query"><!-- wp:post-template -->
+<!-- wp:query {"queryId":10,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"tagName":"main"} -->
+<main class="wp-block-query"><!-- wp:post-template -->
 <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30","margin":{"top":"0","bottom":"0"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 <div class="wp-block-group" style="margin-top:0;margin-bottom:0"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"400","textTransform":"none"},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}},"fontSize":"small"} /-->
 
 <!-- wp:post-date {"format":"M j Y","isLink":true,"className":"nowrap"} /--></div>
 <!-- /wp:group -->
 <!-- /wp:post-template -->
 
+<!-- wp:query-no-results -->
+<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"xx-small"} -->
+<p class="has-xx-small-font-size" style="font-style:normal;font-weight:400"><?php esc_html_e('Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'bysshe');?></p>
+<!-- /wp:paragraph -->
+<!-- /wp:query-no-results -->
+
 <!-- wp:spacer {"height":"40px","style":{"layout":[]}} -->
 <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -87,21 +93,21 @@
 <!-- wp:query-pagination-previous {"label":"Previous"} /-->
 
 <!-- wp:query-pagination-next {"label":"Next"} /-->
-<!-- /wp:query-pagination --></div>
+<!-- /wp:query-pagination --></main>
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"0px","style":{"layout":{"flexSize":"50px","selfStretch":"fixed"}}} -->
 <div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
+<!-- wp:group {"tagName":"footer","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<footer class="wp-block-group"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"lineHeight":"1.3"}},"fontSize":"xxx-small"} /-->
 
 <!-- wp:paragraph {"className":"no-underline","style":{"typography":{"lineHeight":"1.3","textTransform":"uppercase","fontStyle":"normal","fontWeight":"400"}},"fontSize":"xxx-small"} -->
 <p class="no-underline has-xxx-small-font-size" style="font-style:normal;font-weight:400;line-height:1.3;text-transform:uppercase"><?php /* Translators: 1. is the start of a 'a' HTML element, 2. is the end of a 'a' HTML element */ 
 echo sprintf( esc_html__( 'Designed with %1$sWordPress%2$s', 'bysshe' ), '<a href="' . esc_url( 'https://wordpress.org' ) . '" rel="nofollow">', '</a>' ); ?></p>
-<!-- /wp:paragraph --></div>
+<!-- /wp:paragraph --></footer>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:column --></div>