Merge branch 'trunk' into test/style-variations-font-loading

WordPress · Oct 28, 2024 · ca21cb3 · ca21cb3
2 parents d97a03d + 1af1429
commit ca21cb3
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 42 deletions.
diff --git a/patterns/banner-poster.php b/patterns/banner-poster.php
@@ -21,7 +21,14 @@
 			<!-- wp:column {"width":"80%"} -->
 			<div class="wp-block-column" style="flex-basis:80%">
 				<!-- wp:heading {"textAlign":"left","align":"wide","style":{"typography":{"fontSize":"12vw","lineHeight":"0.9","fontStyle":"normal","fontWeight":"300"}}} -->
-				<h2 class="wp-block-heading alignwide has-text-align-left" style="font-size:12vw;font-style:normal;font-weight:300;line-height:0.9"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Sample heading in four languages.', 'twentytwentyfive' ); ?></h2>
+				<h2 class="wp-block-heading alignwide has-text-align-left" style="font-size:12vw;font-style:normal;font-weight:300;line-height:0.9">
+					<?php
+					echo wp_kses_post(
+						/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
+						_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
+					);
+					?>
+				</h2>
 				<!-- /wp:heading -->
 			</div>
 			<!-- /wp:column -->

diff --git a/patterns/cta-events-list.php b/patterns/cta-events-list.php
@@ -61,7 +61,14 @@
 			<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--accent-6);border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:group {"layout":{"type":"constrained"}} -->
 				<div class="wp-block-group">
 					<!-- wp:heading {"level":3} -->
-					<h3 class="wp-block-heading"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h3>
+					<h3 class="wp-block-heading">
+						<?php
+						echo wp_kses_post(
+							/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
+							_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
+						);
+						?>
+					</h3>
 					<!-- /wp:heading -->
 
 					<!-- wp:paragraph -->
@@ -123,7 +130,14 @@
 			<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--accent-6);border-top-width:1px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)"><!-- wp:group {"layout":{"type":"constrained"}} -->
 				<div class="wp-block-group">
 					<!-- wp:heading {"level":3} -->
-					<h3 class="wp-block-heading"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h3>
+					<h3 class="wp-block-heading">
+						<?php
+						echo wp_kses_post(
+							/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
+							_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
+						);
+						?>
+					</h3>
 					<!-- /wp:heading -->
 
 					<!-- wp:paragraph -->

diff --git a/patterns/cta-grid-products-link.php b/patterns/cta-grid-products-link.php
@@ -16,8 +16,8 @@
 <div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
 	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:heading {"style":{"typography":{"fontSize":"11.58rem","letterSpacing":"-0.02em"}}} -->
-		<h2 class="wp-block-heading" style="font-size:11.58rem;letter-spacing:-0.02em"><?php esc_html_e( 'Our online store.', 'twentytwentyfive' ); ?></h2>
+		<!-- wp:heading {"style":{"typography":{"fontSize":"9.6rem","letterSpacing":"-0.02em"}}} -->
+		<h2 class="wp-block-heading" style="font-size:9.6rem;letter-spacing:-0.02em"><?php esc_html_e( 'Our online store.', 'twentytwentyfive' ); ?></h2>
 		<!-- /wp:heading -->
 
 		<!-- wp:group {"layout":{"type":"grid","columnCount":null,"minimumColumnWidth":"10rem"}} -->

diff --git a/patterns/event-rsvp.php b/patterns/event-rsvp.php
@@ -23,7 +23,14 @@
 			<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
 			<div class="wp-block-group">
 				<!-- wp:heading {"fontSize":"xx-large"} -->
-				<h2 class="wp-block-heading has-xx-large-font-size"><?php echo esc_html_x( '“Stories, historias, iсторії, iστορίες”', 'Placeholder heading in four languages.', 'twentytwentyfive' ); ?></h2>
+				<h2 class="wp-block-heading has-xx-large-font-size">
+					<?php
+					echo wp_kses_post(
+						/* translators: This string contains the word "Stories" in four different languages with the first item in the locale's language. */
+						_x( '“Stories, <span lang="es">historias</span>, <span lang="uk">iсторії</span>, <span lang="el">iστορίες</span>”', 'Placeholder heading in four languages.', 'twentytwentyfive' )
+					);
+					?>
+				</h2>
 				<!-- /wp:heading -->
 
 				<!-- wp:paragraph {"fontSize":"x-large"} -->

diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json
@@ -192,7 +192,8 @@
 						},
 						":hover": {
 							"color": {
-								"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)"
+								"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)",
+								"text": "var:preset|color|contrast"
 						}
 					}
 					},

diff --git a/styles/colors/08-midnight.json b/styles/colors/08-midnight.json
@@ -4,6 +4,16 @@
 	"title": "Midnight",
 	"settings": {
 		"color": {
+			"duotone": [
+				{
+					"colors": [
+						"#4433A6",
+						"#79F3B1"
+					],
+					"name": "Midnight filter",
+					"slug": "midnight-filter"
+				}
+			],
 			"palette": [
 				{
 					"color": "#4433A6",

diff --git a/styles/typography/typography-preset-3.json b/styles/typography/typography-preset-3.json
@@ -80,20 +80,20 @@
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "1.8rem",
+						"min": "1.4rem"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.4rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.6rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -102,37 +102,26 @@
 	"styles": {
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontWeight": "400",
 			"letterSpacing": "-0.22px",
-			"lineHeight": "1.6"
+			"lineHeight": "1.5"
 		},
 		"blocks":{
 			"core/code": {
 				"typography": {
 					"letterSpacing": "0px"
 				}
 			},
-			"core/list": {
+			"core/heading": {
 				"typography": {
-					"lineHeight": "1.3"
-				}
-			},
-			"core/loginout": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"lineHeight": "1.2"
 				}
 			},
-			"core/post-author": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
-			"core/post-author-biography": {
+			"core/list": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"lineHeight": "1.3"
 				}
 			},
-			"core/post-author-name": {
+			"core/loginout": {
 				"typography": {
 					"fontSize": "var:preset|font-size|medium"
 				}
@@ -142,12 +131,6 @@
 					"fontWeight": "400"
 				}
 			},
-			"core/post-title": {
-				"typography": {
-					"fontWeight": "500",
-					"letterSpacing": "-0.8px"
-				}
-			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi",
@@ -163,7 +146,7 @@
 			"core/site-title": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|ysabeau-office",
-					"fontSize": "var:preset|font-size|medium",
+					"fontSize": "var:preset|font-size|large",
 					"letterSpacing": "1.44px",
 					"textTransform": "uppercase"
 				}
@@ -182,6 +165,20 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi"
 				}
+			},
+			"h5": {
+				"typography": {
+					"fontSize": "var:preset|font-size|medium"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontSize": "var:preset|font-size|small",
+					"fontWeight": "400",
+					"fontStyle": "initial",
+					"letterSpacing": "initial",
+					"textTransform": "initial"
+				}
 			}
 		}
 	}

diff --git a/styles/typography/typography-preset-6.json b/styles/typography/typography-preset-6.json
@@ -222,11 +222,6 @@
 					}
 				}
 			},
-			"core/query-title": {
-				"typography": {
-					"fontWeight": "800"
-				}
-			},
 			"core/site-title": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi",

diff --git a/styles/typography/typography-preset-7.json b/styles/typography/typography-preset-7.json
@@ -387,7 +387,9 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
+					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "400",
+					"letterSpacing": "-0.01em",
 					"textTransform": "uppercase"
 				}
 			},