From ec91ec56be44d8cdbc611758b9721860aae60491 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Tue, 25 Oct 2022 01:23:25 +0000
Subject: [PATCH] Twenty Twenty-Three: Merge the latest changes from GitHub.

For a full list of changes included, see the `twentytwentythree` repository on GitHub: https://github.com/WordPress/twentytwentythree/compare/0f273d787481b391d428de671659533642b3aa3c...e2005b0272b8480a8fa9155e5802e22659d84674.

Props kafleg, poena, mikachan, tobifjellner, aristath.
See #56383.

git-svn-id: https://develop.svn.wordpress.org/trunk@54686 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentytwentythree/patterns/footer-default.php  | 8 +++++---
 src/wp-content/themes/twentytwentythree/readme.txt        | 6 ++----
 src/wp-content/themes/twentytwentythree/style.css         | 4 ++--
 .../themes/twentytwentythree/styles/aubergine.json        | 5 +++++
 .../themes/twentytwentythree/styles/canary.json           | 5 +++++
 .../themes/twentytwentythree/styles/electric.json         | 5 +++++
 .../themes/twentytwentythree/styles/grapes.json           | 5 +++++
 .../themes/twentytwentythree/styles/pilgrimage.json       | 5 +++++
 src/wp-content/themes/twentytwentythree/styles/pitch.json | 5 +++++
 .../themes/twentytwentythree/styles/whisper.json          | 5 +++++
 src/wp-content/themes/twentytwentythree/theme.json        | 5 +++++
 11 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/wp-content/themes/twentytwentythree/patterns/footer-default.php b/src/wp-content/themes/twentytwentythree/patterns/footer-default.php
index e31900b358..d197bf5e62 100644
--- a/src/wp-content/themes/twentytwentythree/patterns/footer-default.php
+++ b/src/wp-content/themes/twentytwentythree/patterns/footer-default.php
@@ -6,9 +6,11 @@
  * Block Types: core/template-part/footer
  */
 ?>
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|40"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-	<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40)"><!-- wp:site-title {"level":0} /-->
+<!-- wp:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group">
+	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40)">
+		<!-- wp:site-title {"level":0} /-->
 		<!-- wp:paragraph {"align":"right"} -->
 		<p class="has-text-align-right">
 		<?php
diff --git a/src/wp-content/themes/twentytwentythree/readme.txt b/src/wp-content/themes/twentytwentythree/readme.txt
index 4781fd6821..8e0a3d389b 100644
--- a/src/wp-content/themes/twentytwentythree/readme.txt
+++ b/src/wp-content/themes/twentytwentythree/readme.txt
@@ -9,11 +9,9 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
 
-Twenty Twenty-Three is a diverse, collaborative effort designed with the expansion of the possibilities of the block editor in mind. With a blank, unopinionated base as a starting point, this year’s default theme has minimal demo content to get in your way.
+Twenty Twenty-Three is designed to take advantage of the new design tools introduced in WordPress 6.1. With a clean, blank base as a starting point, this default theme includes ten diverse style variations created by members of the WordPress community.
 
-It embraces aesthetic diversity with a collection of style variations created by members of the WordPress Community, and it is built to take advantage of the new tools introduced in WordPress 6.1.
-
-Whether you want to build a complex or incredibly simple website, you can style it the way you want it, and you can do it quickly and intuitively through the bundled styles or dive into creation and full customisation yourself.
+Whether you want to build a complex or incredibly simple website, you can do it quickly and intuitively through the bundled styles or dive into creation and full customization yourself.
 
 == Changelog ==
 
diff --git a/src/wp-content/themes/twentytwentythree/style.css b/src/wp-content/themes/twentytwentythree/style.css
index 1287fc9dbf..5b49ceecc8 100644
--- a/src/wp-content/themes/twentytwentythree/style.css
+++ b/src/wp-content/themes/twentytwentythree/style.css
@@ -3,7 +3,7 @@ Theme Name: Twenty Twenty-Three
 Theme URI: https://wordpress.org/themes/twentytwentythree
 Author: the WordPress team
 Author URI: https://wordpress.org
-Description: Twenty Twenty-Three is a diverse, collaborative effort designed with the expansion of the possibilities of the block editor in mind. With a blank, unopinionated base as a starting point, this year’s default theme has minimal demo content to get in your way. It embraces aesthetic diversity with a collection of style variations created by members of the WordPress Community, and it is built to take advantage of the new tools introduced in WordPress 6.1. Whether you want to build a complex or incredibly simple website, you can style it the way you want it, and you can do it quickly and intuitively through the bundled styles or dive into creation and full customisation yourself.
+Description: Twenty Twenty-Three is designed to take advantage of the new design tools introduced in WordPress 6.1. With a clean, blank base as a starting point, this default theme includes ten diverse style variations created by members of the WordPress community. Whether you want to build a complex or incredibly simple website, you can do it quickly and intuitively through the bundled styles or dive into creation and full customization yourself.
 Requires at least: 6.1
 Tested up to: 6.1
 Requires PHP: 5.6
@@ -11,5 +11,5 @@ Version: 1.0
 License: GNU General Public License v2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 Text Domain: twentytwentythree
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, translation-ready, wide-blocks, accessibility-ready, blog, portfolio, news
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, translation-ready, wide-blocks, block-styles, accessibility-ready, blog, portfolio, news
 */
diff --git a/src/wp-content/themes/twentytwentythree/styles/aubergine.json b/src/wp-content/themes/twentytwentythree/styles/aubergine.json
index 83f6f3c89e..aab104550e 100644
--- a/src/wp-content/themes/twentytwentythree/styles/aubergine.json
+++ b/src/wp-content/themes/twentytwentythree/styles/aubergine.json
@@ -265,6 +265,11 @@
 						"gradient": "none",
 						"text": "var(--wp--preset--color--secondary)"
 					}
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
 				}
 			},
 			"heading": {
diff --git a/src/wp-content/themes/twentytwentythree/styles/canary.json b/src/wp-content/themes/twentytwentythree/styles/canary.json
index abe95f7ce1..f8d8f807f6 100644
--- a/src/wp-content/themes/twentytwentythree/styles/canary.json
+++ b/src/wp-content/themes/twentytwentythree/styles/canary.json
@@ -189,6 +189,11 @@
 						"width": "2px"
 					}
 				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
+				},
 				"border": {
 					"radius": "5px",
 					"color": "var(--wp--preset--color--contrast)",
diff --git a/src/wp-content/themes/twentytwentythree/styles/electric.json b/src/wp-content/themes/twentytwentythree/styles/electric.json
index 6dae63eb50..077ca0920f 100644
--- a/src/wp-content/themes/twentytwentythree/styles/electric.json
+++ b/src/wp-content/themes/twentytwentythree/styles/electric.json
@@ -73,6 +73,11 @@
 						"background": "var(--wp--preset--color--base)",
 						"text": "var(--wp--preset--color--contrast)"
 					}
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
 				}
 			},
 			"link": {
diff --git a/src/wp-content/themes/twentytwentythree/styles/grapes.json b/src/wp-content/themes/twentytwentythree/styles/grapes.json
index 25a007fc2b..cf0c4b4a1f 100644
--- a/src/wp-content/themes/twentytwentythree/styles/grapes.json
+++ b/src/wp-content/themes/twentytwentythree/styles/grapes.json
@@ -72,6 +72,11 @@
 				"color": {
 					"background": "var(--wp--preset--color--primary)",
 					"text": "var(--wp--preset--color--base)"
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
 				}
 			},
 			"heading": {
diff --git a/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json b/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json
index 4e3dda4733..be16addf29 100644
--- a/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json
+++ b/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json
@@ -250,6 +250,11 @@
 						"gradient": "var(--wp--preset--gradient--secondary-primary)"
 					}
 				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
+				},
 				"border": {
 					"radius": "5px"
 				},
diff --git a/src/wp-content/themes/twentytwentythree/styles/pitch.json b/src/wp-content/themes/twentytwentythree/styles/pitch.json
index 98420e2357..10c42120ee 100644
--- a/src/wp-content/themes/twentytwentythree/styles/pitch.json
+++ b/src/wp-content/themes/twentytwentythree/styles/pitch.json
@@ -196,6 +196,11 @@
 						"background": "var(--wp--preset--color--contrast)",
 						"text": "var(--wp--preset--color--tertiary)"
 					}
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--base)"
+					}
 				}
 			},
 			"h1": {
diff --git a/src/wp-content/themes/twentytwentythree/styles/whisper.json b/src/wp-content/themes/twentytwentythree/styles/whisper.json
index 7c4f593a8e..d35267d0ce 100644
--- a/src/wp-content/themes/twentytwentythree/styles/whisper.json
+++ b/src/wp-content/themes/twentytwentythree/styles/whisper.json
@@ -421,6 +421,11 @@
 							"bottom": "min(calc(1rem + 2px), 3vw) !important"
 						}
 					}
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--primary)"
+					}
 				}
 			},
 			"cite": {
diff --git a/src/wp-content/themes/twentytwentythree/theme.json b/src/wp-content/themes/twentytwentythree/theme.json
index 0ed2ae18fb..ba78a4a50f 100644
--- a/src/wp-content/themes/twentytwentythree/theme.json
+++ b/src/wp-content/themes/twentytwentythree/theme.json
@@ -619,6 +619,11 @@
 						"background": "var(--wp--preset--color--secondary)",
 						"text": "var(--wp--preset--color--base)"
 					}
+				},
+				":visited": {
+					"color": {
+						"text": "var(--wp--preset--color--contrast)"
+					}
 				}
 			},
 			"h1": {