Merge pull request #635 from WordPress/update/color-palette-parity

Fix: Parity between style variations and colors + typography presets. Co-authored-by: juanfra <[email protected]> Co-authored-by: beafialho <[email protected]> Co-authored-by: carolinan <[email protected]>
WordPress · Oct 25, 2024 · 1af1429 · 1af1429
2 parents 294ceca + f88ba47
commit 1af1429
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 36 deletions.
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
@@ -32,20 +32,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"
 				}
 			]
@@ -54,37 +54,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"
 				}
@@ -94,12 +83,6 @@
 					"fontWeight": "400"
 				}
 			},
-			"core/post-title": {
-				"typography": {
-					"fontWeight": "500",
-					"letterSpacing": "-0.8px"
-				}
-			},
 			"core/pullquote": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|platypi",
@@ -115,7 +98,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"
 				}
@@ -134,6 +117,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
@@ -58,11 +58,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
@@ -99,7 +99,9 @@
 			"button": {
 				"typography": {
 					"fontFamily": "var:preset|font-family|literata",
+					"fontSize": "var:preset|font-size|medium",
 					"fontWeight": "400",
+					"letterSpacing": "-0.01em",
 					"textTransform": "uppercase"
 				}
 			},