Merge branch 'trunk' into update/style-variation-search-block

WordPress · Oct 14, 2024 · e18e9b0 · e18e9b0
2 parents 355db29 + 9ce5623
commit e18e9b0
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 264 deletions.
diff --git a/patterns/page-link-in-bio-wide-margins.php b/patterns/page-link-in-bio-wide-margins.php
@@ -38,7 +38,7 @@
 				<p><?php echo esc_html_x( 'I&rsquo;m Nora, a dedicated public interest attorney based in Denver. I&rsquo;m a graduate of Stanford University.', 'Pattern placeholder text.', 'twentytwentyfive' ); ?></p>
 				<!-- /wp:paragraph -->
 
-				<!-- wp:social-links {"iconColor":"contrast","iconColorValue":"#111111","className":"is-style-logos-only"} -->
+				<!-- wp:social-links {"iconColor":"currentColor","iconColorValue":"currentColor","className":"is-style-logos-only"} -->
 				<ul class="wp-block-social-links has-icon-color is-style-logos-only">
 					<!-- wp:social-link {"url":"#","service":"x"} /-->
 

diff --git a/style.css b/style.css
@@ -30,7 +30,7 @@ a {
 }
 
 /*
- * Progresive enhancement to reduce widows and orphans
+ * Progressive enhancement to reduce widows and orphans
  * https://github.com/WordPress/gutenberg/issues/55190
  */
 h1, h2, h3, h4, h5, h6, blockquote, caption, figcaption, p {

diff --git a/styles/02-noon.json b/styles/02-noon.json
@@ -57,38 +57,38 @@
 				},
 				{
 					"fluid": {
-						"max": "1.3rem",
-						"min": "1.2rem"
+						"max": "1.2rem",
+						"min": "1rem"
 					},
 					"name": "Medium",
 					"size": "1rem",
 					"slug": "medium"
 				},
 				{
 					"fluid": {
-						"max": "1.6rem",
-						"min": "1.3rem"
+						"max": "1.8rem",
+						"min": "1.6rem"
 					},
 					"name": "Large",
-					"size": "1.38rem",
+					"size": "1.6rem",
 					"slug": "large"
 				},
 				{
 					"fluid": {
-						"max": "2rem",
-						"min": "1.75rem"
+						"max": "2.2rem",
+						"min": "1.8em"
 					},
 					"name": "Extra Large",
-					"size": "1.75rem",
+					"size": "1.8rem",
 					"slug": "x-large"
 				},
 				{
 					"fluid": {
-						"max": "3.625rem",
-						"min": "2.625rem"
+						"max": "2.8rem",
+						"min": "2rem"
 					},
 					"name": "Extra Extra Large",
-					"size": "2.625rem",
+					"size": "2rem",
 					"slug": "xx-large"
 				}
 			]
@@ -101,8 +101,8 @@
 		"typography": {
 			"fontFamily": "var:preset|font-family|literata",
 			"fontSize": "var:preset|font-size|medium",
-			"letterSpacing": "-0.22px",
-			"lineHeight": "1.5"
+			"letterSpacing": "-0.01em",
+			"lineHeight": "1.6"
 		},
 		"blocks": {
 			"core/button": {
@@ -164,26 +164,8 @@
 					"fontSize": "var:preset|font-size|medium"
 				}
 			},
-			"core/post-author": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-author-name": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti"
-				}
-			},
-			"core/post-date": {
-				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium"
-				}
-			},
 			"core/post-terms": {
 				"typography": {
-					"fontFamily": "var:preset|font-family|beiruti",
-					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "300"
 				}
 			},
@@ -197,11 +179,6 @@
 							"text": "var:preset|color|accent-3"
 						}
 					}
-				},
-				"typography": {
-					"fontSize": "var:preset|font-size|xx-large",
-					"fontWeight": "500",
-					"letterSpacing": "-1px"
 				}
 			},
 			"core/pullquote": {
@@ -221,6 +198,11 @@
 					"lineHeight": "1"
 				}
 			},
+			"core/quote": {
+				"typography": {
+					"fontSize": "var:preset|font-size|medium"
+				}
+			},
 			"core/query-pagination": {
 				"typography": {
 					"fontWeight": "300"
@@ -238,11 +220,6 @@
 					}
 				}
 			},
-			"core/quote": {
-				"typography": {
-					"fontWeight": "300"
-				}
-			},
 			"core/search": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|beiruti"
@@ -282,19 +259,15 @@
 					"text": "var:preset|color|base"
 				}
 			},
-			"h3": {
-				"typography": {
-					"fontSize": "1.8rem"
-				}
-			},
 			"h4": {
 				"typography": {
 					"fontSize": "var:preset|font-size|large"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var:preset|font-size|medium"
+					"fontSize": "var:preset|font-size|medium",
+					"letterSpacing": "0px"
 				}
 			},
 			"h6": {
@@ -309,7 +282,8 @@
 				"typography": {
 					"fontFamily": "var:preset|font-family|beiruti",
 					"fontWeight": "500",
-					"letterSpacing": "-1px"
+					"letterSpacing": "-0.02em",
+					"lineHeight": "1.02"
 				}
 			},
 			"link": {

diff --git a/styles/06-morning.json b/styles/06-morning.json
@@ -46,6 +46,52 @@
 					"slug": "accent-6"
 				}
 			]
+		},
+		"typography": {
+			"fontSizes": [
+				{
+					"fluid": false,
+					"name": "Small",
+					"size": "0.875rem",
+					"slug": "small"
+				},
+				{
+					"fluid": {
+						"max": "1.125rem",
+						"min": "1rem"
+					},
+					"name": "Medium",
+					"size": "1rem",
+					"slug": "medium"
+				},
+				{
+					"fluid": {
+						"max": "1.375rem",
+						"min": "1.125rem"
+					},
+					"name": "Large",
+					"size": "1.38rem",
+					"slug": "large"
+				},
+				{
+					"fluid": {
+						"max": "2rem",
+						"min": "1.75rem"
+					},
+					"name": "Extra Large",
+					"size": "1.75rem",
+					"slug": "x-large"
+				},
+				{
+					"fluid": {
+						"max": "2.6rem",
+						"min": "1.4rem"
+					},
+					"name": "Extra Extra Large",
+					"size": "2.6rem",
+					"slug": "xx-large"
+				}
+			]
 		}
 	},
 	"styles": {
@@ -54,10 +100,7 @@
 		},
 		"typography": {
 			"fontFamily": "var:preset|font-family|ysabeau-office",
-			"fontSize": "1.5rem",
-			"fontWeight": "400",
-			"letterSpacing": "-0.24px",
-			"lineHeight": "1.4"
+			"letterSpacing": "-0.24px"
 		},
 		"blocks": {
 			"core/code": {
@@ -81,36 +124,6 @@
 				}
 			},
 			"core/post-author-name": {
-				"typography": {
-					"fontSize": "var:preset|font-size|medium"
-				},
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|contrast"
-						},
-						"typography": {
-							"textDecoration": "underline"
-						},
-						":hover": {
-							"typography": {
-								"textDecoration": "none"
-							}
-						}
-					}
-				}
-			},
-			"core/post-terms": {
-				"typography": {
-					"fontWeight": "400",
-					"fontSize": "var:preset|font-size|medium"
-				},
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
 				"elements": {
 					"link": {
 						"color": {
@@ -145,7 +158,7 @@
 					"text": "var:preset|color|contrast"
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|x-large"
+					"fontSize": "var:preset|font-size|xx-large"
 				},
 				"elements": {
 					"cite": {
@@ -160,14 +173,6 @@
 				}
 			},
 			"core/quote": {
-				"color": {
-					"text": "var:preset|color|contrast"
-				},
-				"typography": {
-					"fontSize": "1.5rem",
-					"fontWeight": "500",
-					"letterSpacing": "-0.18px"
-				},
 				"elements": {
 					"cite": {
 						"typography": {
@@ -207,7 +212,7 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontSize": "1.375rem",
+					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "900",
 					"letterSpacing": "-0.36px"
 				},
@@ -231,7 +236,19 @@
 				},
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": "1.2"
+				}
+			},
+			"h5": {
+				"typography": {
+					"letterSpacing": "0px"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontWeight": "900",
+					"letterSpacing": "0px"
 				}
 			},
 			"link": {
@@ -312,9 +329,10 @@
 						},
 						":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"
+							}
 						}
-					}
 					},
 					"link": {
 						"color": {