Merging upstream version 6.5+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

17 files changed, 69 insertions, 35 deletions

diff --git a/wp-content/themes/twentytwentyfour/functions.php b/wp-content/themes/twentytwentyfour/functions.php
index baee062..8536cb8 100644
--- a/wp-content/themes/twentytwentyfour/functions.php
+++ b/wp-content/themes/twentytwentyfour/functions.php
@@ -194,7 +194,7 @@ if ( ! function_exists( 'twentytwentyfour_pattern_categories' ) ) :
 	function twentytwentyfour_pattern_categories() {
 
 		register_block_pattern_category(
-			'page',
+			'twentytwentyfour_page',
 			array(
 				'label'       => _x( 'Pages', 'Block pattern category', 'twentytwentyfour' ),
 				'description' => __( 'A collection of full page layouts.', 'twentytwentyfour' ),
diff --git a/wp-content/themes/twentytwentyfour/parts/header.html b/wp-content/themes/twentytwentyfour/parts/header.html
index 632900c..2fa483b 100644
--- a/wp-content/themes/twentytwentyfour/parts/header.html
+++ b/wp-content/themes/twentytwentyfour/parts/header.html
@@ -15,7 +15,11 @@
 		</div>
 		<!-- /wp:group -->
 
-		<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}}} /-->
+		<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"left"}} -->
+		<div class="wp-block-group">
+			<!-- wp:navigation {"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}}} /-->
+		</div>
+		<!-- /wp:group -->
 	</div>
 	<!-- /wp:group -->
 </div>
diff --git a/wp-content/themes/twentytwentyfour/patterns/footer.php b/wp-content/themes/twentytwentyfour/patterns/footer.php
index b39b3dd..85f310d 100644
--- a/wp-content/themes/twentytwentyfour/patterns/footer.php
+++ b/wp-content/themes/twentytwentyfour/patterns/footer.php
@@ -45,9 +45,9 @@
 
 						<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'About', 'twentytwentyfour' ); ?>"} -->
 
-						<!-- wp:navigation-link {"label":"Team","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"History","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"Careers","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Team', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'History', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Careers', 'twentytwentyfour' ); ?>","url":"#"} /-->
 
 						<!-- /wp:navigation -->
 
@@ -68,9 +68,9 @@
 
 						<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Privacy', 'twentytwentyfour' ); ?>"} -->
 
-						<!-- wp:navigation-link {"label":"Privacy Policy","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"Terms and Conditions","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"Contact Us","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Privacy Policy', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Terms and Conditions', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Contact Us', 'twentytwentyfour' ); ?>","url":"#"} /-->
 
 						<!-- /wp:navigation -->
 
@@ -90,9 +90,9 @@
 
 						<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","orientation":"vertical"},"style":{"typography":{"fontStyle":"normal","fontWeight":"400"},"spacing":{"blockGap":"var:preset|spacing|10"}},"fontSize":"small","ariaLabel":"<?php esc_attr_e( 'Social Media', 'twentytwentyfour' ); ?>"} -->
 
-						<!-- wp:navigation-link {"label":"Facebook","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"Instagram","url":"#"} /-->
-						<!-- wp:navigation-link {"label":"Twitter/X","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Facebook', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Instagram', 'twentytwentyfour' ); ?>","url":"#"} /-->
+						<!-- wp:navigation-link {"label":"<?php esc_html_e( 'Twitter/X', 'twentytwentyfour' ); ?>","url":"#"} /-->
 
 						<!-- /wp:navigation -->
 
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php b/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php
index 29e6abc..1af3e7d 100644
--- a/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php
+++ b/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php
@@ -13,7 +13,7 @@
 <!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignwide">
 	<!-- wp:heading {"level":1,"align":"wide","style":{"typography":{"lineHeight":"1.2"}},"fontSize":"xx-large"} -->
-	<h1 class="wp-block-heading alignwide has-xx-large-font-size" style="line-height:1.2"><?php echo wp_kses_post( __( 'I’m <em>Leia Acosta</em>, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.' ) ); ?></h1>
+	<h1 class="wp-block-heading alignwide has-xx-large-font-size" style="line-height:1.2"><?php echo wp_kses_post( __( 'I’m <em>Leia Acosta</em>, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.', 'twentytwentyfour' ) ); ?></h1>
 	<!-- /wp:heading -->
 </div>
 <!-- /wp:group -->
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-about-business.php b/wp-content/themes/twentytwentyfour/patterns/page-about-business.php
index f04b209..ad62698 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-about-business.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-about-business.php
@@ -2,7 +2,7 @@
 /**
  * Title: About
  * Slug: twentytwentyfour/page-about-business
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php b/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php
index ae88e90..5cef5d4 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php
@@ -2,7 +2,7 @@
 /**
  * Title: Blogging home
  * Slug: twentytwentyfour/page-home-blogging
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: page, starter
  * Post Types: page, wp_template
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-business.php b/wp-content/themes/twentytwentyfour/patterns/page-home-business.php
index ca22952..415c42f 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-home-business.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-home-business.php
@@ -2,7 +2,7 @@
 /**
  * Title: Business home
  * Slug: twentytwentyfour/page-home-business
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php
index cce1fdb..a9ce9d7 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php
@@ -2,7 +2,7 @@
 /**
  * Title: Portfolio home image gallery
  * Slug: twentytwentyfour/page-home-gallery
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php
index 4f3c473..40d4fa1 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php
@@ -2,7 +2,7 @@
 /**
  * Title: Portfolio home with post featured images
  * Slug: twentytwentyfour/page-home-portfolio
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php
index 24c6d9a..5ee552e 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php
@@ -2,7 +2,7 @@
 /**
  * Title: Newsletter landing
  * Slug: twentytwentyfour/page-newsletter-landing
- * Categories: call-to-action, page, featured
+ * Categories: call-to-action, twentytwentyfour_page, featured
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php b/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php
index 3e29b11..b0bf21b 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php
@@ -2,7 +2,7 @@
 /**
  * Title: Portfolio project overview
  * Slug: twentytwentyfour/page-portfolio-overview
- * Categories: page, featured
+ * Categories: twentytwentyfour_page, featured
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php b/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php
index 469a134..8b3ba83 100644
--- a/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php
+++ b/wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php
@@ -2,7 +2,7 @@
 /**
  * Title: RSVP landing
  * Slug: twentytwentyfour/page-rsvp-landing
- * Categories: page
+ * Categories: twentytwentyfour_page
  * Keywords: starter
  * Block Types: core/post-content
  * Post Types: page, wp_template
diff --git a/wp-content/themes/twentytwentyfour/readme.txt b/wp-content/themes/twentytwentyfour/readme.txt
index c1837d4..50c9ff5 100644
--- a/wp-content/themes/twentytwentyfour/readme.txt
+++ b/wp-content/themes/twentytwentyfour/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Twenty-Four ===
 Contributors: wordpressdotorg
 Requires at least: 6.4
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.0
-Stable tag: 1.0
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -13,6 +13,11 @@ Twenty Twenty-Four is designed to be flexible, versatile and applicable to any w
 
 == Changelog ==
 
+= 1.1 =
+* Released: April 2, 2024
+
+https://wordpress.org/documentation/article/twenty-twenty-four-changelog/#Version_1.1
+
 = 1.0 =
 * Released: November 7, 2023
 
@@ -33,7 +38,33 @@ 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.
 
+
+This theme bundles the following third-party resources:
+
+=== Fonts ===
+
+Cardo Font
+Copyright (c) 2002-2011, David J. Perry (hospes02@scholarsfonts.net)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: http://scholarsfonts.net
+
+Instrument Sans Font
+Copyright 2022 The Instrument Sans Project Authors.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://github.com/Instrument/instrument-sans
+
+Inter Font
+Copyright 2020 The Inter Project Authors.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://github.com/rsms/inter
+
+Jost Font
+Copyright 2020 The Jost Project Authors.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://github.com/indestructible-type/Jost
+
 === Images ===
+
 License: CC0 https://creativecommons.org/publicdomain/zero/1.0/
 
 museum.webp - https://www.rawpixel.com/image/3297419/free-photo-image-interior-hallway-architecture
diff --git a/wp-content/themes/twentytwentyfour/screenshot.png b/wp-content/themes/twentytwentyfour/screenshot.png
index 40c5b99..74fa4c7 100644
--- a/wp-content/themes/twentytwentyfour/screenshot.png
+++ b/wp-content/themes/twentytwentyfour/screenshot.png
diff --git a/wp-content/themes/twentytwentyfour/style.css b/wp-content/themes/twentytwentyfour/style.css
index 6325914..75c9804 100644
--- a/wp-content/themes/twentytwentyfour/style.css
+++ b/wp-content/themes/twentytwentyfour/style.css
@@ -5,9 +5,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org
 Description: Twenty Twenty-Four is designed to be flexible, versatile and applicable to any website. Its collection of templates and patterns tailor to different needs, such as presenting a business, blogging and writing or showcasing work. A multitude of possibilities open up with just a few adjustments to color and typography. Twenty Twenty-Four comes with style variations and full page designs to help speed up the site building process, is fully compatible with the site editor, and takes advantage of new design tools introduced in WordPress 6.4.
 Requires at least: 6.4
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.0
-Version: 1.0
+Version: 1.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyfour
diff --git a/wp-content/themes/twentytwentyfour/styles/ember.json b/wp-content/themes/twentytwentyfour/styles/ember.json
index 37e9c41..f4e612c 100644
--- a/wp-content/themes/twentytwentyfour/styles/ember.json
+++ b/wp-content/themes/twentytwentyfour/styles/ember.json
@@ -7,8 +7,8 @@
 			"duotone": [
 				{
 					"colors": [
-						"#FF3C00",
-						"#F4F0E6"
+						"#D73301",
+						"#F9F8F5"
 					],
 					"slug": "duotone-2",
 					"name": "Orange and white"
@@ -78,12 +78,12 @@
 			],
 			"palette": [
 				{
-					"color": "#F4F0E6",
+					"color": "#F9F8F5",
 					"name": "Base",
 					"slug": "base"
 				},
 				{
-					"color": "#FF3C00",
+					"color": "#D73301",
 					"name": "Contrast / 2",
 					"slug": "contrast-2"
 				},
diff --git a/wp-content/themes/twentytwentyfour/theme.json b/wp-content/themes/twentytwentyfour/theme.json
index 5de83df..fe6bd3b 100644
--- a/wp-content/themes/twentytwentyfour/theme.json
+++ b/wp-content/themes/twentytwentyfour/theme.json
@@ -247,7 +247,7 @@
 				{
 					"fontFamily": "Iowan Old Style, Apple Garamond, Baskerville, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol",
 					"name": "System Serif",
-					"slug": "system-Serif"
+					"slug": "system-serif"
 				}
 			],
 			"fontSizes": [
@@ -795,9 +795,7 @@
 					},
 					"outline": {
 						"color": "var(--wp--preset--color--contrast)",
-						"offset": "2px",
-						"style": "dotted",
-						"width": "1px"
+						"offset": "2px"
 					},
 					"border": {
 						"color": "var(--wp--preset--color--contrast-2)"
@@ -908,7 +906,8 @@
 			"fontStyle": "normal",
 			"fontWeight": "400",
 			"lineHeight": "1.55"
-		}
+		},
+		"css": ":where(.wp-site-blocks *:focus){outline-width:2px;outline-style:solid}"
 	},
 	"templateParts": [
 		{
@@ -941,12 +940,12 @@
 		{
 			"name": "page-with-sidebar",
 			"postTypes": ["page"],
-			"title": "Page With Sidebar"
+			"title": "Page with Sidebar"
 		},
 		{
 			"name": "page-wide",
 			"postTypes": ["page"],
-			"title": "Page with wide Image"
+			"title": "Page with Wide Image"
 		},
 		{
 			"name": "single-with-sidebar",