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

Tweak variations to remove explicit color references #619

Merged
merged 17 commits into from
Nov 4, 2024
Merged

Tweak variations to remove explicit color references #619

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2522f2b
remove duplicate overriding json
richtabor Oct 22, 2024
47cbc57
noon
richtabor Oct 22, 2024
1847dd2
use current color instead of fixed colors
richtabor Oct 22, 2024
c983dcf
apply current color to variations post author and terms
richtabor Oct 22, 2024
c566bf8
more
richtabor Oct 22, 2024
76dd271
site title
richtabor Oct 22, 2024
ef12628
Merge branch 'trunk' into tweak/variations
juanfra Oct 24, 2024
52211b1
Merge branch 'trunk' into tweak/variations
juanfra Oct 25, 2024
d080fe1
Fix parity between variations and color files. Fix contrast issues.
juanfra Oct 25, 2024
187acd0
account for more blocks with custom colors
richtabor Oct 25, 2024
46c4152
Merge branch 'trunk' into tweak/variations
juanfra Oct 29, 2024
bbc2e87
Noon: Set heading color for section 4 to `currentColor`
juanfra Oct 29, 2024
87117f4
Fix quote text color and border color.
juanfra Oct 30, 2024
e125502
Fix the text color for the pull quote in the different section styles.
juanfra Oct 30, 2024
864a03b
Update link colors for quote and pullquote in section styles.
juanfra Oct 30, 2024
2718fe1
Remove link styles as not needed.
juanfra Oct 31, 2024
fc3c6a8
Set color for post date in the different variations.
juanfra Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions styles/01-evening.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@
}
}
},
"section-3": {
"elements": {
"link": {
"color": {
"text": "var:preset|color|contrast"
}
}
}
},
"section-4": {
"elements": {
"button": {
Expand All @@ -144,20 +135,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
17 changes: 2 additions & 15 deletions styles/02-noon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@
"right": "1.6rem",
"top": "0.6rem"
}
},
"border": {
"color": "currentColor"
}
}
}
Expand Down Expand Up @@ -287,14 +284,9 @@
}
}
},
"heading": {
"color": {
"text": "var:preset|color|accent-2"
}
},
"link": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -311,14 +303,9 @@
}
}
},
"heading": {
"color": {
"text": "var:preset|color|base"
}
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions styles/03-dusk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
}
}
},
"section-1":{
"section-1": {
"elements": {
"link": {
"color": {
Expand All @@ -298,12 +298,12 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"heading": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand All @@ -315,7 +315,7 @@
"elements": {
"heading": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -337,12 +337,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions styles/06-morning.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
"elements": {
"heading": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -321,12 +321,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 @@ -351,7 +351,7 @@
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions styles/07-sunrise.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-5"
"text": "currentColor"
}
},
"button": {
Expand All @@ -276,7 +276,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -299,7 +299,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -322,7 +322,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
},
"button": {
Expand All @@ -346,12 +346,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
},
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand All @@ -314,7 +314,7 @@
},
"link": {
"color": {
"text": "var:preset|color|accent-5"
"text": "currentColor"
}
}
}
Expand Down
42 changes: 0 additions & 42 deletions styles/colors/01-evening.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,6 @@
"color": {
"text": "var:preset|color|accent-4"
},
"blocks": {
"core/site-tagline": {
"color": {
"text": "var:preset|color|accent-4"
},
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-4"
}
}
}
}
},
"elements": {
"button": {
"color": {
Expand All @@ -78,11 +64,6 @@
"text": "var:preset|color|base"
}
}
},
"link": {
"color": {
"text": "var:preset|color|accent-4"
}
}
},
"variations": {
Expand All @@ -101,15 +82,6 @@
}
}
},
"section-3": {
"elements": {
"link": {
"color": {
"text": "var:preset|color|contrast"
}
}
}
},
"section-4": {
"elements": {
"button": {
Expand All @@ -122,20 +94,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
40 changes: 6 additions & 34 deletions styles/colors/02-noon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,7 @@
"blocks": {
"core/button": {
"border": {
"bottom": {
"color": "var:preset|color|contrast"
},
"left": {
"color": "var:preset|color|contrast"
},
"right": {
"color": "var:preset|color|contrast"
},
"top": {
"color": "var:preset|color|contrast"
}
},
"variations": {
"outline": {
"border": {
"color": "currentColor"
}
}
"color": "var:preset|color|contrast"
}
},
"core/post-title": {
Expand All @@ -83,7 +65,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand All @@ -95,7 +77,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand All @@ -107,7 +89,7 @@
"elements": {
"link": {
"color": {
"text": "var:preset|color|accent-3"
"text": "currentColor"
}
}
}
Expand Down Expand Up @@ -144,14 +126,9 @@
}
}
},
"heading": {
"color": {
"text": "var:preset|color|accent-2"
}
},
"link": {
"color": {
"text": "var:preset|color|accent-2"
"text": "currentColor"
}
}
}
Expand All @@ -168,14 +145,9 @@
}
}
},
"heading": {
"color": {
"text": "var:preset|color|base"
}
},
"link": {
"color": {
"text": "var:preset|color|base"
"text": "currentColor"
}
}
}
Expand Down
Loading
Loading