Skip to content

Commit d64fed2

Browse files
authored
Merge pull request #13973 from ethereum/design-token-colors-and-tags
Design token colors and tags for Pablo
2 parents 302ecaf + 13e001b commit d64fed2

File tree

4 files changed

+52
-12
lines changed

4 files changed

+52
-12
lines changed

src/components/ui/tag.tsx

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ const tagVariants = cva(
99
status: {
1010
normal: "bg-background-highlight text-body-medium border-body-medium",
1111
tag: "bg-primary-low-contrast text-primary border-primary",
12-
success: "bg-success-light text-success border-success",
13-
error: "bg-error-light text-error border-error",
14-
warning: "bg-warning-light text-warning border-warning",
12+
success: "bg-success-light text-success border-success-border",
13+
error: "bg-error-light text-error border-error-border",
14+
warning: "bg-warning-light text-warning-dark border-warning-border",
1515
},
1616
variant: {
1717
subtle: "border-transparent",
@@ -33,17 +33,32 @@ const tagVariants = cva(
3333
{
3434
variant: "solid",
3535
status: "success",
36-
className: "bg-success",
36+
className: "bg-success text-success-light",
3737
},
3838
{
3939
variant: "solid",
4040
status: "error",
41-
className: "bg-error",
41+
className: "bg-error text-error-light",
4242
},
4343
{
4444
variant: "solid",
4545
status: "warning",
46-
className: "bg-warning",
46+
className: "bg-warning text-warning-light",
47+
},
48+
{
49+
variant: "outline",
50+
status: "success",
51+
className: "text-success-border",
52+
},
53+
{
54+
variant: "outline",
55+
status: "error",
56+
className: "text-error-border",
57+
},
58+
{
59+
variant: "outline",
60+
status: "warning",
61+
className: "text-warning-border",
4762
},
4863
],
4964
defaultVariants: {

src/styles/colors.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
--yellow-500: 38, 92%, 50%; /* #F59E0B */
7373
--yellow-600: 32, 95%, 44%; /* #D97706 */
7474
--yellow-700: 26, 90%, 37%; /* #B45309 */
75-
--yellow-800: 23, 83%, 31%; /* #92400E */
76-
--yellow-900: 22, 78%, 26%; /* #78350F */
75+
--yellow-800: 23, 88%, 22%; /* #6B2D07 */
76+
--yellow-900: 22, 84%, 15%; /* #471E06 */
7777

7878
--red-50: 0, 86%, 97%; /* #fef2f2 */
7979
--red-100: 0, 93%, 94%; /* #fee2e2 */
@@ -84,7 +84,7 @@
8484
--red-600: 0, 72%, 51%; /* #dc2626 */
8585
--red-700: 0, 74%, 42%; /* #b91c1c */
8686
--red-800: 0, 70%, 35%; /* #991b1b */
87-
--red-900: 0, 63%, 31%; /* #7f1d1d */
87+
--red-900: 0, 82%, 19%; /* #5A0909 */
8888

8989
--green-50: 138, 76%, 97%; /* #F0FDF4 */
9090
--green-100: 141, 84%, 93%; /* #DCFCE7 */
@@ -94,8 +94,8 @@
9494
--green-500: 142, 71%, 45%; /* #22C55E */
9595
--green-600: 142, 76%, 36%; /* #16A34A */
9696
--green-700: 142, 72%, 29%; /* #15803D */
97-
--green-800: 143, 64%, 24%; /* #166534 */
98-
--green-900: 144, 61%, 20%; /* #14532D */
97+
--green-800: 143, 74%, 19%; /* #0D5629 */
98+
--green-900: 143, 79%, 11%; /* #063418 */
9999

100100
--orange-100: 30, 100%, 94%; /* #FFF0DB */
101101
--orange-800: 10, 76%, 28%; /* #7D2711 */

src/styles/semantic-tokens.css

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@
4444

4545
--success: var(--green-600);
4646
--success-light: var(--green-100);
47+
--success-dark: var(--green-900);
48+
--success-border: var(--green-700);
4749

4850
--error: var(--red-700);
4951
--error-light: var(--red-100);
52+
--error-dark: var(--red-900);
53+
--error-border: var(--red-800);
5054

51-
--warning: var(--yellow-400);
55+
--warning: var(--yellow-300);
5256
--warning-light: var(--yellow-100);
57+
--warning-dark: var(--yellow-900);
58+
--warning-border: var(--yellow-700);
5359

5460
/**
5561
/* Gradients (radial, conic, or linear over 3 stops)
@@ -146,7 +152,20 @@
146152
--accent-c: var(--teal-400);
147153
--accent-c-hover: var(--teal-300);
148154

155+
--success: var(--green-600);
156+
--success-light: var(--green-100);
157+
--success-dark: var(--green-900);
158+
--success-border: var(--green-400);
159+
160+
--error: var(--red-700);
161+
--error-light: var(--red-100);
162+
--error-dark: var(--red-900);
163+
--error-border: var(--red-300);
164+
149165
--warning: var(--yellow-300);
166+
--warning-light: var(--yellow-100);
167+
--warning-dark: var(--yellow-900);
168+
--warning-border: var(--yellow-200);
150169

151170
/* Gradients (dark mode adjustments) */
152171
--radial-a-opacity-1: 0.16;

tailwind.config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,16 +184,22 @@ const config = {
184184
success: {
185185
DEFAULT: "hsla(var(--success))",
186186
light: "hsla(var(--success-light))",
187+
dark: "hsla(var(--success-dark))",
188+
border: "hsla(var(--success-border))",
187189
},
188190

189191
error: {
190192
DEFAULT: "hsla(var(--error))",
191193
light: "hsla(var(--error-light))",
194+
dark: "hsla(var(--error-dark))",
195+
border: "hsla(var(--error-border))",
192196
},
193197

194198
warning: {
195199
DEFAULT: "hsla(var(--warning))",
196200
light: "hsla(var(--warning-light))",
201+
dark: "hsla(var(--warning-dark))",
202+
border: "hsla(var(--warning-border))",
197203
},
198204

199205
/** @deprecated */

0 commit comments

Comments
 (0)