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

Commit 40b5281

Browse files
juanfrarichtaborcarolinanbeafialhoalaminfirdows
authored
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]>
2 parents 349defc + fc3c6a8 commit 40b5281

20 files changed

+542
-185
lines changed

‎styles/01-evening.json‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@
6666
}
6767
}
6868
}
69-
},
70-
"core/site-tagline": {
71-
"color": {
72-
"text": "var:preset|color|accent-4"
73-
},
74-
"elements": {
75-
"link": {
76-
"color": {
77-
"text": "var:preset|color|accent-4"
78-
}
79-
}
80-
}
8169
}
8270
},
8371
"elements": {
@@ -100,11 +88,6 @@
10088
"top": "0.6rem"
10189
}
10290
}
103-
},
104-
"link": {
105-
"color": {
106-
"text": "var:preset|color|accent-4"
107-
}
10891
}
10992
},
11093
"variations": {
@@ -123,15 +106,6 @@
123106
}
124107
}
125108
},
126-
"section-3": {
127-
"elements": {
128-
"link": {
129-
"color": {
130-
"text": "var:preset|color|contrast"
131-
}
132-
}
133-
}
134-
},
135109
"section-4": {
136110
"elements": {
137111
"button": {
@@ -144,20 +118,6 @@
144118
"background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)"
145119
}
146120
}
147-
},
148-
"link": {
149-
"color": {
150-
"text": "var:preset|color|accent-2"
151-
}
152-
}
153-
}
154-
},
155-
"section-5": {
156-
"elements": {
157-
"link": {
158-
"color": {
159-
"text": "var:preset|color|base"
160-
}
161121
}
162122
}
163123
}

‎styles/02-noon.json‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -259,23 +259,7 @@
259259
"blocks": {
260260
"core/button": {
261261
"border": {
262-
"bottom": {
263-
"color": "var:preset|color|contrast",
264-
"style": "solid"
265-
},
266-
"left": {
267-
"color": "var:preset|color|contrast",
268-
"style": "solid"
269-
},
270-
"radius": "999px",
271-
"right": {
272-
"color": "var:preset|color|contrast",
273-
"style": "solid"
274-
},
275-
"top": {
276-
"color": "var:preset|color|contrast",
277-
"style": "solid"
278-
}
262+
"color": "var:preset|color|contrast"
279263
},
280264
"shadow": "var:preset|shadow|natural",
281265
"spacing": {
@@ -299,9 +283,6 @@
299283
"right": "1.6rem",
300284
"top": "0.6rem"
301285
}
302-
},
303-
"border": {
304-
"color": "currentColor"
305286
}
306287
}
307288
}
@@ -328,7 +309,7 @@
328309
"elements": {
329310
"link": {
330311
"color": {
331-
"text": "var:preset|color|accent-3"
312+
"text": "currentColor"
332313
}
333314
}
334315
}
@@ -340,7 +321,7 @@
340321
"elements": {
341322
"link": {
342323
"color": {
343-
"text": "var:preset|color|accent-3"
324+
"text": "currentColor"
344325
}
345326
}
346327
},
@@ -367,7 +348,7 @@
367348
"elements": {
368349
"link": {
369350
"color": {
370-
"text": "var:preset|color|accent-3"
351+
"text": "currentColor"
371352
}
372353
}
373354
}
@@ -422,7 +403,7 @@
422403
},
423404
"link": {
424405
"color": {
425-
"text": "var:preset|color|contrast"
406+
"text": "currentColor"
426407
}
427408
}
428409
},
@@ -441,12 +422,12 @@
441422
},
442423
"heading": {
443424
"color": {
444-
"text": "var:preset|color|accent-2"
425+
"text": "currentColor"
445426
}
446427
},
447428
"link": {
448429
"color": {
449-
"text": "var:preset|color|accent-2"
430+
"text": "currentColor"
450431
}
451432
}
452433
}
@@ -470,7 +451,7 @@
470451
},
471452
"link": {
472453
"color": {
473-
"text": "var:preset|color|base"
454+
"text": "currentColor"
474455
}
475456
}
476457
}

‎styles/03-dusk.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"elements": {
129129
"link": {
130130
"color": {
131-
"text": "var:preset|color|accent-2"
131+
"text": "currentColor"
132132
}
133133
}
134134
}
@@ -143,7 +143,7 @@
143143
"elements": {
144144
"link": {
145145
"color": {
146-
"text": "var:preset|color|accent-2"
146+
"text": "currentColor"
147147
}
148148
}
149149
}
@@ -289,7 +289,7 @@
289289
}
290290
}
291291
},
292-
"section-1":{
292+
"section-1": {
293293
"elements": {
294294
"link": {
295295
"color": {
@@ -316,12 +316,12 @@
316316
},
317317
"link": {
318318
"color": {
319-
"text": "var:preset|color|base"
319+
"text": "currentColor"
320320
}
321321
},
322322
"heading": {
323323
"color": {
324-
"text": "var:preset|color|base"
324+
"text": "currentColor"
325325
}
326326
}
327327
}
@@ -333,7 +333,7 @@
333333
"elements": {
334334
"heading": {
335335
"color": {
336-
"text": "var:preset|color|accent-2"
336+
"text": "currentColor"
337337
}
338338
}
339339
}
@@ -355,12 +355,12 @@
355355
},
356356
"link": {
357357
"color": {
358-
"text": "var:preset|color|base"
358+
"text": "currentColor"
359359
}
360360
},
361361
"heading": {
362362
"color": {
363-
"text": "var:preset|color|base"
363+
"text": "currentColor"
364364
}
365365
}
366366
}

‎styles/05-twilight.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
},
235235
"link": {
236236
"color": {
237-
"text": "var:preset|color|base"
237+
"text": "currentColor"
238238
}
239239
}
240240
}

‎styles/06-morning.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
},
396396
"link": {
397397
"color": {
398-
"text": "var:preset|color|contrast"
398+
"text": "currentColor"
399399
}
400400
}
401401
},
@@ -453,7 +453,7 @@
453453
"elements": {
454454
"heading": {
455455
"color": {
456-
"text": "var:preset|color|base"
456+
"text": "currentColor"
457457
}
458458
},
459459
"button": {
@@ -465,12 +465,12 @@
465465
"color": {
466466
"background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)",
467467
"text": "var:preset|color|contrast"
468-
}
469468
}
469+
}
470470
},
471471
"link": {
472472
"color": {
473-
"text": "var:preset|color|base"
473+
"text": "currentColor"
474474
}
475475
}
476476
}
@@ -495,7 +495,7 @@
495495
},
496496
"link": {
497497
"color": {
498-
"text": "var:preset|color|base"
498+
"text": "currentColor"
499499
}
500500
}
501501
}

‎styles/07-sunrise.json‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,6 @@
304304
"fontWeight": "600",
305305
"letterSpacing": "-0.24px"
306306
},
307-
"border": {
308-
"color": "var:preset|color|accent-2"
309-
},
310307
"elements": {
311308
"cite": {
312309
"typography": {
@@ -391,7 +388,7 @@
391388
"elements": {
392389
"link": {
393390
"color": {
394-
"text": "var:preset|color|accent-5"
391+
"text": "currentColor"
395392
}
396393
},
397394
"button": {
@@ -414,7 +411,7 @@
414411
"elements": {
415412
"link": {
416413
"color": {
417-
"text": "var:preset|color|base"
414+
"text": "currentColor"
418415
}
419416
},
420417
"button": {
@@ -437,7 +434,7 @@
437434
"elements": {
438435
"link": {
439436
"color": {
440-
"text": "var:preset|color|base"
437+
"text": "currentColor"
441438
}
442439
},
443440
"button": {
@@ -460,7 +457,7 @@
460457
"elements": {
461458
"link": {
462459
"color": {
463-
"text": "var:preset|color|base"
460+
"text": "currentColor"
464461
}
465462
},
466463
"button": {
@@ -484,12 +481,12 @@
484481
"elements": {
485482
"heading": {
486483
"color": {
487-
"text": "var:preset|color|contrast"
484+
"text": "currentColor"
488485
}
489486
},
490487
"link": {
491488
"color": {
492-
"text": "var:preset|color|contrast"
489+
"text": "currentColor"
493490
}
494491
},
495492
"button": {

‎styles/08-midnight.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@
579579
},
580580
"link": {
581581
"color": {
582-
"text": "var:preset|color|accent-3"
582+
"text": "currentColor"
583583
}
584584
}
585585
}
@@ -602,7 +602,7 @@
602602
},
603603
"link": {
604604
"color": {
605-
"text": "var:preset|color|accent-5"
605+
"text": "currentColor"
606606
}
607607
}
608608
}

0 commit comments

Comments
 (0)