From 4e1711e9a24fc3d3ba7340231d3434d2a30db761 Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Fri, 22 Sep 2023 11:33:15 -0400
Subject: [PATCH] Content: Fix heading structure, punctuation in headings

Fixes #162
---
 .../patterns/_site-hero.php                   |  2 +-
 .../patterns/page-browse.php                  | 22 +++++++++----------
 .../src/tags-archive/render.php               |  4 ++--
 .../src/tags-archive/style.scss               |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/source/wp-content/themes/wporg-showcase-2022/patterns/_site-hero.php b/source/wp-content/themes/wporg-showcase-2022/patterns/_site-hero.php
index 978808ff..199b2022 100644
--- a/source/wp-content/themes/wporg-showcase-2022/patterns/_site-hero.php
+++ b/source/wp-content/themes/wporg-showcase-2022/patterns/_site-hero.php
@@ -26,7 +26,7 @@
 					<!-- /wp:heading -->
 
 					<!-- wp:paragraph {"fontSize":"small",style":{"spacing":{"margin":{"top":"var:preset|spacing|10"}}}} -->
-					<p class="has-small-font-size" style="margin-top:var(--wp--preset--spacing--10)"><?php esc_html_e( 'Star-studded sites built with WordPress', 'wporg' ); ?></p>
+					<p class="has-small-font-size" style="margin-top:var(--wp--preset--spacing--10)"><?php esc_html_e( 'Star-studded sites built with WordPress.', 'wporg' ); ?></p>
 					<!-- /wp:paragraph -->
 
 					<!-- wp:wporg/site-meta-list {"meta":["post_title","domain","category"],"showLabel":false,"fontSize":"small","style":{"elements":{"link":{"color":{"text":"var:preset|color|blueberry-2"}}},"border":{"radius":"2px","style":"solid","width":"1px"},"spacing":{"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}}},"borderColor":"charcoal-3","textColor":"light-grey-2"} /-->
diff --git a/source/wp-content/themes/wporg-showcase-2022/patterns/page-browse.php b/source/wp-content/themes/wporg-showcase-2022/patterns/page-browse.php
index 7828b670..bb9169e7 100644
--- a/source/wp-content/themes/wporg-showcase-2022/patterns/page-browse.php
+++ b/source/wp-content/themes/wporg-showcase-2022/patterns/page-browse.php
@@ -11,14 +11,14 @@
 	<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group alignwide">
 		<!-- wp:heading {"level":1,"fontSize":"heading-3"} -->
-		<h1 class="wp-block-heading has-heading-3-font-size"><?php esc_html_e( 'Browse the showcase by category, flavor, or tag', 'wporg' ); ?></h1>
+		<h1 class="wp-block-heading has-heading-3-font-size"><?php esc_html_e( 'Browse by category, flavor, or tag', 'wporg' ); ?></h1>
 		<!-- /wp:heading -->
 
 		<!-- wp:group {"layout":{"type":"default"}} -->
 		<div class="wp-block-group">
-			<!-- wp:paragraph -->
-			<p><?php _e( 'Wonderful WordPress websites by category.', 'wporg' ); ?></p>
-			<!-- /wp:paragraph -->
+			<!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"normal","fontFamily":"inter"} -->
+			<h2 class="wp-block-heading has-inter-font-family has-normal-font-size" style="font-style:normal;font-weight:400"><?php _e( 'Wonderful WordPress websites by category', 'wporg' ); ?></h2>
+			<!-- /wp:heading -->
 
 			<!-- wp:wporg/term-grid {"showPostCounts":true} /-->
 		</div>
@@ -26,9 +26,9 @@
 
 		<!-- wp:group {"layout":{"type":"default"}} -->
 		<div class="wp-block-group">
-			<!-- wp:paragraph -->
-			<p><?php _e( 'Wonderful WordPress websites by flavor.', 'wporg' ); ?></p>
-			<!-- /wp:paragraph -->
+			<!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"normal","fontFamily":"inter"} -->
+			<h2 class="wp-block-heading has-inter-font-family has-normal-font-size" style="font-style:normal;font-weight:400"><?php _e( 'Wonderful WordPress websites by flavor', 'wporg' ); ?></h2>
+			<!-- /wp:heading -->
 
 			<!-- wp:wporg/term-grid {"showPostCounts":true,"term":"flavor"} /-->
 		</div>
@@ -42,10 +42,10 @@
 
 	<!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50)">
-		<!-- wp:paragraph -->
-		<p><?php _e( 'Wonderful WordPress websites by tag.', 'wporg' ); ?></p>
-		<!-- /wp:paragraph -->
-		
+		<!-- wp:heading {"level":2,"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"normal","fontFamily":"inter"} -->
+		<h2 class="wp-block-heading has-inter-font-family has-normal-font-size" style="font-style:normal;font-weight:400"><?php _e( 'Wonderful WordPress websites by tag', 'wporg' ); ?></h2>
+		<!-- /wp:heading -->
+
 		<!-- wp:wporg/tags-archive /-->
 	</div>
 	<!-- /wp:group -->
diff --git a/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/render.php b/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/render.php
index 024dea77..29a905ef 100644
--- a/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/render.php
+++ b/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/render.php
@@ -31,8 +31,8 @@
 >
 <?php foreach ( $alphabet as $letter ) : ?>
 	<div class="wporg-tags-archive__row">
-		<h2><?php echo esc_html( $letter ); ?></h2>
-		<ul>
+		<h3 class="wporg-tags-archive__letter"><?php echo esc_html( $letter ); ?></h3>
+		<ul class="wporg-tags-archive__list">
 		<?php foreach ( $by_alphabet[ $letter ] as $_term ) : ?>
 			<li>
 				<a href="<?php echo esc_url( get_term_link( $_term ) ); ?>">
diff --git a/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/style.scss b/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/style.scss
index 742b72ea..d77c38dc 100644
--- a/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/style.scss
+++ b/source/wp-content/themes/wporg-showcase-2022/src/tags-archive/style.scss
@@ -10,7 +10,7 @@
 		gap: 0;
 	}
 
-	h2 {
+	.wporg-tags-archive__letter {
 		margin: 0 !important;
 		align-self: flex-start;
 		font-size: var(--wp--preset--font-size--extra-large);
@@ -20,7 +20,7 @@
 		text-transform: uppercase;
 	}
 
-	ul {
+	.wporg-tags-archive__list {
 		list-style: none;
 		margin: 0;
 		padding: 0;