Merge pull request #619 from WordPress/tweak/variations

Tweak variations to remove explicit color references Co-authored-by: richtabor <[email protected]> Co-authored-by: juanfra <[email protected]> Co-authored-by: carolinan <[email protected]> Co-authored-by: beafialho <[email protected]> Co-authored-by: alaminfirdows <[email protected]>
WordPress · Nov 4, 2024 · 40b5281 · 40b5281
2 parents 349defc + fc3c6a8
commit 40b5281
Show file tree

Hide file tree

Showing 20 changed files with 542 additions and 185 deletions.
diff --git a/styles/01-evening.json b/styles/01-evening.json
@@ -66,18 +66,6 @@
 						}
 					}
 				}
-			},
-			"core/site-tagline": {
-				"color": {
-					"text": "var:preset|color|accent-4"
-				},
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|accent-4"
-						}
-					}
-				}
 			}
 		},
 		"elements": {
@@ -100,11 +88,6 @@
 						"top": "0.6rem"
 					}
 				}
-			},
-			"link": {
-				"color": {
-					"text": "var:preset|color|accent-4"
-				}
 			}
 		},
 		"variations": {
@@ -123,15 +106,6 @@
 					}
 				}
 			},
-			"section-3": {
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|contrast"
-						}
-					}
-				}
-			},
 			"section-4": {
 				"elements": {
 					"button": {
@@ -144,20 +118,6 @@
 								"background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)"
 							}
 						}
-					},
-					"link": {
-						"color": {
-							"text": "var:preset|color|accent-2"
-						}
-					}
-				}
-			},
-			"section-5": {
-				"elements": {
-					"link": {
-						"color": {
-							"text": "var:preset|color|base"
-						}
 					}
 				}
 			}

diff --git a/styles/02-noon.json b/styles/02-noon.json
@@ -259,23 +259,7 @@
 		"blocks": {
 			"core/button": {
 				"border": {
-					"bottom": {
-						"color": "var:preset|color|contrast",
-						"style": "solid"
-					},
-					"left": {
-						"color": "var:preset|color|contrast",
-						"style": "solid"
-					},
-					"radius": "999px",
-					"right": {
-						"color": "var:preset|color|contrast",
-						"style": "solid"
-					},
-					"top": {
-						"color": "var:preset|color|contrast",
-						"style": "solid"
-					}
+					"color": "var:preset|color|contrast"
 				},
 				"shadow": "var:preset|shadow|natural",
 				"spacing": {
@@ -299,9 +283,6 @@
 								"right": "1.6rem",
 								"top": "0.6rem"
 							}
-						},
-						"border": {
-							"color": "currentColor"
 						}
 					}
 				}
@@ -328,7 +309,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-3"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -340,7 +321,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-3"
+							"text": "currentColor"
 						}
 					}
 				},
@@ -367,7 +348,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-3"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -422,7 +403,7 @@
 			},
 			"link": {
 				"color": {
-					"text": "var:preset|color|contrast"
+					"text": "currentColor"
 				}
 			}
 		},
@@ -441,12 +422,12 @@
 					},
 					"heading": {
 						"color": {
-							"text": "var:preset|color|accent-2"
+							"text": "currentColor"
 						}
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-2"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -470,7 +451,7 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}

diff --git a/styles/03-dusk.json b/styles/03-dusk.json
@@ -128,7 +128,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-2"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -143,7 +143,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-2"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -289,7 +289,7 @@
 					}
 				}
 			},
-			"section-1":{
+			"section-1": {
 				"elements": {
 					"link": {
 						"color": {
@@ -316,12 +316,12 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"heading": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -333,7 +333,7 @@
 				"elements": {
 					"heading": {
 						"color": {
-							"text": "var:preset|color|accent-2"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -355,12 +355,12 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"heading": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}

diff --git a/styles/05-twilight.json b/styles/05-twilight.json
@@ -234,7 +234,7 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}

diff --git a/styles/06-morning.json b/styles/06-morning.json
@@ -395,7 +395,7 @@
 			},
 			"link": {
 				"color": {
-					"text": "var:preset|color|contrast"
+					"text": "currentColor"
 				}
 			}
 		},
@@ -453,7 +453,7 @@
 				"elements": {
 					"heading": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"button": {
@@ -465,12 +465,12 @@
 							"color": {
 								"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)",
 								"text": "var:preset|color|contrast"
-							}
 						}
+					}
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -495,7 +495,7 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					}
 				}

diff --git a/styles/07-sunrise.json b/styles/07-sunrise.json
@@ -304,9 +304,6 @@
 					"fontWeight": "600",
 					"letterSpacing": "-0.24px"
 				},
-				"border": {
-					"color": "var:preset|color|accent-2"
-				},
 				"elements": {
 					"cite": {
 						"typography": {
@@ -391,7 +388,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-5"
+							"text": "currentColor"
 						}
 					},
 					"button": {
@@ -414,7 +411,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"button": {
@@ -437,7 +434,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"button": {
@@ -460,7 +457,7 @@
 				"elements": {
 					"link": {
 						"color": {
-							"text": "var:preset|color|base"
+							"text": "currentColor"
 						}
 					},
 					"button": {
@@ -484,12 +481,12 @@
 				"elements": {
 					"heading": {
 						"color": {
-							"text": "var:preset|color|contrast"
+							"text": "currentColor"
 						}
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|contrast"
+							"text": "currentColor"
 						}
 					},
 					"button": {

diff --git a/styles/08-midnight.json b/styles/08-midnight.json
@@ -579,7 +579,7 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-3"
+							"text": "currentColor"
 						}
 					}
 				}
@@ -602,7 +602,7 @@
 					},
 					"link": {
 						"color": {
-							"text": "var:preset|color|accent-5"
+							"text": "currentColor"
 						}
 					}
 				}