Skip to content
This repository has been archived by the owner on Nov 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #619 from WordPress/tweak/variations
Browse files Browse the repository at this point in the history 
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]>
  • Loading branch information
@juanfra @richtabor @carolinan
6 people authored Nov 4, 2024
2 parents 349defc + fc3c6a8 commit 40b5281
Show file tree
Hide file tree
Showing 20 changed files with 542 additions and 185 deletions.
40 changes: 0 additions & 40 deletions styles/01-evening.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,6 @@
}
}
}
},
"core/site-tagline": {
"color": {
"text": "var:preset|color|accent-4"
},
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-4"
}
}
}
}
},
"elements": {
Expand All @@ -100,11 +88,6 @@
"top": "0.6rem"
}
}
},
"link": {
"color": {
"text": "var:preset|color|accent-4"
}
}
},
"variations": {
Expand All @@ -123,15 +106,6 @@
}
}
},
"section-3": {
"elements": {
"link": {
"color": {
"text": "var:preset|color|contrast"
}
}
}
},
"section-4": {
"elements": {
"button": {
Expand All @@ -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"
}
}
}
}
Expand Down
35 changes: 8 additions & 27 deletions styles/02-noon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -299,9 +283,6 @@
"right": "1.6rem",
"top": "0.6rem"
}
},
"border": {
"color": "currentColor"
}
}
}
Expand All @@ -328,7 +309,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand All @@ -340,7 +321,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
},
Expand All @@ -367,7 +348,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand Down Expand Up @@ -422,7 +403,7 @@
},
"link": {
"color": {
"text": "var:preset|color|contrast"
"text": "currentColor"
}
}
},
Expand All @@ -441,12 +422,12 @@
},
"heading": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
},
"link": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -470,7 +451,7 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions styles/03-dusk.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -143,7 +143,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand Down Expand Up @@ -289,7 +289,7 @@
}
}
},
"section-1":{
"section-1": {
"elements": {
"link": {
"color": {
Expand All @@ -316,12 +316,12 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"heading": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand All @@ -333,7 +333,7 @@
"elements": {
"heading": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -355,12 +355,12 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"heading": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion styles/05-twilight.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions styles/06-morning.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
},
"link": {
"color": {
"text": "var:preset|color|contrast"
"text": "currentColor"
}
}
},
Expand Down Expand Up @@ -453,7 +453,7 @@
"elements": {
"heading": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -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"
}
}
}
Expand All @@ -495,7 +495,7 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
15 changes: 6 additions & 9 deletions styles/07-sunrise.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,6 @@
"fontWeight": "600",
"letterSpacing": "-0.24px"
},
"border": {
"color": "var:preset|color|accent-2"
},
"elements": {
"cite": {
"typography": {
Expand Down Expand Up @@ -391,7 +388,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-5"
"text": "currentColor"
}
},
"button": {
Expand All @@ -414,7 +411,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -437,7 +434,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -460,7 +457,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -484,12 +481,12 @@
"elements": {
"heading": {
"color": {
"text": "var:preset|color|contrast"
"text": "currentColor"
}
},
"link": {
"color": {
"text": "var:preset|color|contrast"
"text": "currentColor"
}
},
"button": {
Expand Down
4 changes: 2 additions & 2 deletions styles/08-midnight.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
},
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand All @@ -602,7 +602,7 @@
},
"link": {
"color": {
"text": "var:preset|color|accent-5"
"text": "currentColor"
}
}
}
Expand Down
Loading

0 comments on commit 40b5281

Please sign in to comment.