From e2ca673b546f06fe94159ff52a648c15bce30fbb Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Tue, 20 Feb 2024 03:44:30 +0900
Subject: [PATCH 1/4] Move article-meta pattern above chapter-list.

---
 .../themes/wporg-developer-2023/src/chapter-list/block.php     | 3 ++-
 .../themes/wporg-developer-2023/templates/single-handbook.html | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/src/chapter-list/block.php b/source/wp-content/themes/wporg-developer-2023/src/chapter-list/block.php
index b546790c5..69d0b9f46 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/chapter-list/block.php
+++ b/source/wp-content/themes/wporg-developer-2023/src/chapter-list/block.php
@@ -70,8 +70,9 @@ function render( $attributes, $content, $block ) {
 
 	$wrapper_attributes = get_block_wrapper_attributes();
 	return sprintf(
-		'<aside %1$s><nav>%2$s<ul class="wporg-chapter-list__list">%3$s</ul></nav></aside>',
+		'<aside %1$s>%2$s<nav>%3$s<ul class="wporg-chapter-list__list">%4$s</ul></nav></aside>',
 		$wrapper_attributes,
+		do_blocks( '<!-- wp:pattern {"slug":"wporg-developer-2023/article-meta"} /-->' ),
 		$header,
 		$content
 	);
diff --git a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
index e285f8075..fecbfd28c 100644
--- a/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
+++ b/source/wp-content/themes/wporg-developer-2023/templates/single-handbook.html
@@ -19,8 +19,6 @@
 
 				<!-- wp:post-content /-->
 
-				<!-- wp:pattern {"slug":"wporg-developer-2023/article-meta"} /-->
-
 				<!-- wp:pattern {"slug":"wporg-developer-2023/handbook-pagination"} /-->
 
 			</article>
@@ -30,7 +28,6 @@
 		<!-- /wp:group -->
 
 		<!-- wp:wporg/sidebar-container {"hasBackToTop":false,"inlineBreakpoint": "768px"} -->
-
 			<!-- wp:wporg/chapter-list /-->
 
 		<!-- /wp:wporg/sidebar-container -->

From e7bf549709f0d774792d18a5df5652b744101067 Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Tue, 20 Feb 2024 03:54:16 +0900
Subject: [PATCH 2/4] Adjust article-meta styles.

---
 .../themes/wporg-developer-2023/patterns/article-meta.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php b/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
index f02b2c2b7..f7cb6cc05 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
@@ -7,8 +7,8 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|40"},"margin":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"blockGap":"var:preset|spacing|20"},"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"},"className":"entry-meta"} -->
-<div class="wp-block-group entry-meta" style="border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px;margin-top:var(--wp--preset--spacing--40);margin-bottom:var(--wp--preset--spacing--40);padding-top:var(--wp--preset--spacing--40)">
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|20"},"margin":{"top":"20","bottom":"0"},"blockGap":"var:preset|spacing|10"},"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}}},"className":"entry-meta","layout":{"type":"flex","orientation":"vertical"}} -->
+<div class="wp-block-group entry-meta" style="border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px;margin-top:20px;margin-bottom:0;padding-top:var(--wp--preset--spacing--20)">
 
 	<!-- wp:wporg/article-meta-date {"heading":"<?php esc_html_e( 'First published', 'wporg' ); ?>"} /-->
 

From 8a1e90b09ff3e60df2c772c880f22d61b9c280be Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Tue, 20 Feb 2024 04:22:20 +0900
Subject: [PATCH 3/4]  Adjust chapter-list styles.

---
 .../themes/wporg-developer-2023/patterns/article-meta.php      | 2 +-
 .../themes/wporg-developer-2023/src/chapter-list/style.scss    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php b/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
index f7cb6cc05..c33921a0c 100644
--- a/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
+++ b/source/wp-content/themes/wporg-developer-2023/patterns/article-meta.php
@@ -7,7 +7,7 @@
 
 ?>
 
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|20"},"margin":{"top":"20","bottom":"0"},"blockGap":"var:preset|spacing|10"},"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}}},"className":"entry-meta","layout":{"type":"flex","orientation":"vertical"}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|20"},"margin":{"top":"20","bottom":"0"},"blockGap":"5px"},"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}}},"className":"entry-meta","layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group entry-meta" style="border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px;margin-top:20px;margin-bottom:0;padding-top:var(--wp--preset--spacing--20)">
 
 	<!-- wp:wporg/article-meta-date {"heading":"<?php esc_html_e( 'First published', 'wporg' ); ?>"} /-->
diff --git a/source/wp-content/themes/wporg-developer-2023/src/chapter-list/style.scss b/source/wp-content/themes/wporg-developer-2023/src/chapter-list/style.scss
index 09b8094d3..5e4b752dd 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/chapter-list/style.scss
+++ b/source/wp-content/themes/wporg-developer-2023/src/chapter-list/style.scss
@@ -3,6 +3,9 @@
 	--local--icon-size: calc(var(--local--line-height) * 1em);
 	line-height: var(--local--line-height);
 
+	display: flex;
+	flex-direction: column-reverse;
+
 	@media (max-width: 767px) {
 		border: 1px solid var(--wp--preset--color--light-grey-1);
 		border-radius: 2px;

From 8fb024cd5e58d874edbe62e61c763acd29a3f61a Mon Sep 17 00:00:00 2001
From: ren <18050944+renintw@users.noreply.github.com>
Date: Tue, 20 Feb 2024 05:09:29 +0900
Subject: [PATCH 4/4] Adjust entry-meta style.

---
 .../themes/wporg-developer-2023/src/style/style.scss   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
index 591e1deb6..3bd44feb2 100644
--- a/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
+++ b/source/wp-content/themes/wporg-developer-2023/src/style/style.scss
@@ -135,12 +135,20 @@ pre {
 
 // Wrap meta on smaller screens. Double class needed to override core style.
 .entry-meta.entry-meta {
+	a {
+		color: var(--wp--custom--link--color--text);
+		text-decoration: underline;
+	}
 
 	@media (max-width: 781px) {
 		flex-wrap: wrap;
+		margin: 0 !important;
+		padding: 15px var(--wp--preset--spacing--20) !important;
+		flex-direction: row;
+		gap: 20px !important;
 
 		> * {
-			min-width: calc(50% - var(--wp--preset--spacing--20) / 2);
+			min-width: 30%;
 		}
 	}