Skip to content

Commit 4f8c6fb

Browse files
committed
fix(): Reintroduce extends.
1 parent f238cb7 commit 4f8c6fb

File tree

3 files changed

+62
-60
lines changed

3 files changed

+62
-60
lines changed

src/tailwindTheme.ts

+58-56
Original file line numberDiff line numberDiff line change
@@ -11,66 +11,68 @@ export const tailwindTheme = {
1111
"2xl": "1400px",
1212
},
1313
},
14-
colors: {
15-
quantinuum: "hsl(var(--quantinuum))",
16-
border: "hsl(var(--border))",
17-
input: "hsl(var(--input))",
18-
ring: "hsl(var(--ring))",
19-
background: "hsl(var(--background))",
20-
foreground: "hsl(var(--foreground))",
21-
primary: {
22-
DEFAULT: "hsl(var(--primary))",
23-
foreground: "hsl(var(--primary-foreground))",
14+
extend: {
15+
colors: {
16+
quantinuum: "hsl(var(--quantinuum))",
17+
border: "hsl(var(--border))",
18+
input: "hsl(var(--input))",
19+
ring: "hsl(var(--ring))",
20+
background: "hsl(var(--background))",
21+
foreground: "hsl(var(--foreground))",
22+
primary: {
23+
DEFAULT: "hsl(var(--primary))",
24+
foreground: "hsl(var(--primary-foreground))",
25+
},
26+
secondary: {
27+
DEFAULT: "hsl(var(--secondary))",
28+
foreground: "hsl(var(--secondary-foreground))",
29+
},
30+
destructive: {
31+
DEFAULT: "hsl(var(--destructive))",
32+
foreground: "hsl(var(--destructive-foreground))",
33+
},
34+
muted: {
35+
DEFAULT: "hsl(var(--muted))",
36+
foreground: "hsl(var(--muted-foreground))",
37+
},
38+
accent: {
39+
DEFAULT: "hsl(var(--accent))",
40+
foreground: "hsl(var(--accent-foreground))",
41+
},
42+
popover: {
43+
DEFAULT: "hsl(var(--popover))",
44+
foreground: "hsl(var(--popover-foreground))",
45+
},
46+
card: {
47+
DEFAULT: "hsl(var(--card))",
48+
foreground: "hsl(var(--card-foreground))",
49+
},
2450
},
25-
secondary: {
26-
DEFAULT: "hsl(var(--secondary))",
27-
foreground: "hsl(var(--secondary-foreground))",
51+
borderRadius: {
52+
xl: `calc(var(--radius) + 4px)`,
53+
lg: "var(--radius)",
54+
md: "calc(var(--radius) - 2px)",
55+
sm: "calc(var(--radius) - 4px)",
2856
},
29-
destructive: {
30-
DEFAULT: "hsl(var(--destructive))",
31-
foreground: "hsl(var(--destructive-foreground))",
57+
keyframes: {
58+
"accordion-down": {
59+
from: { height: "0" },
60+
to: { height: "var(--radix-accordion-content-height)" },
61+
},
62+
"accordion-up": {
63+
from: { height: "var(--radix-accordion-content-height)" },
64+
to: { height: "0" },
65+
},
66+
"slide-up": {
67+
from: { opacity: "0", transform: "translateY(50%)" },
68+
to: { opacity: "1", transform: "translateY(0)" },
69+
},
3270
},
33-
muted: {
34-
DEFAULT: "hsl(var(--muted))",
35-
foreground: "hsl(var(--muted-foreground))",
71+
animation: {
72+
"accordion-down": "accordion-down 0.2s ease-out",
73+
"accordion-up": "accordion-up 0.2s ease-out",
74+
"slide-up": "slide-up 0.6s ease-in",
3675
},
37-
accent: {
38-
DEFAULT: "hsl(var(--accent))",
39-
foreground: "hsl(var(--accent-foreground))",
40-
},
41-
popover: {
42-
DEFAULT: "hsl(var(--popover))",
43-
foreground: "hsl(var(--popover-foreground))",
44-
},
45-
card: {
46-
DEFAULT: "hsl(var(--card))",
47-
foreground: "hsl(var(--card-foreground))",
48-
},
49-
},
50-
borderRadius: {
51-
xl: `calc(var(--radius) + 4px)`,
52-
lg: "var(--radius)",
53-
md: "calc(var(--radius) - 2px)",
54-
sm: "calc(var(--radius) - 4px)",
55-
},
56-
keyframes: {
57-
"accordion-down": {
58-
from: { height: "0" },
59-
to: { height: "var(--radix-accordion-content-height)" },
60-
},
61-
"accordion-up": {
62-
from: { height: "var(--radix-accordion-content-height)" },
63-
to: { height: "0" },
64-
},
65-
"slide-up": {
66-
from: { opacity: "0", transform: "translateY(50%)" },
67-
to: { opacity: "1", transform: "translateY(0)" },
68-
},
69-
},
70-
animation: {
71-
"accordion-down": "accordion-down 0.2s ease-out",
72-
"accordion-up": "accordion-up 0.2s ease-out",
73-
"slide-up": "slide-up 0.6s ease-in",
7476
},
7577
},
7678
plugins: [animate, typography],

src/tokens.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
--secondary-foreground: 240 5.9% 10%;
1212
--muted: 240 4.8% 95.9%;
1313
--muted-foreground: 240 3.8% 46.1%;
14-
--accent: 240 4.8% 95.9%;
14+
--accent: 170 40% 61%;
1515
--accent-foreground: 240 5.9% 10%;
1616
--destructive: 0 84.2% 60.2%;
1717
--destructive-foreground: 0 0% 98%;
@@ -41,7 +41,7 @@
4141
--secondary-foreground: 0 0% 98%;
4242
--muted: 240 5.9% 10%;
4343
--muted-foreground: 240 5% 64.9%;
44-
--accent: 240 5.9% 10%
44+
--accent: 170 40% 61%;
4545
--accent-foreground: 0 0% 98%;
4646
--destructive: 0 62.8% 30.6%;
4747
--destructive-foreground: 0 0% 98%;
@@ -53,5 +53,5 @@
5353
--chart-3: 30 80% 55%;
5454
--chart-4: 280 65% 60%;
5555
--chart-5: 340 75% 55%;
56-
--quantinuum: 170 54% 41%;
56+
--quantinuum: 170 40% 61%;
5757
}

stories/shadcn/badge.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function BadgeDemo() {
88
<Badge variant='destructive'>Destructive</Badge>
99
<Badge variant='outline'>Outlined</Badge>
1010
<Badge variant='secondary'>Secondary</Badge>
11-
<Badge variant='secondary' className='bg-quantinuum'>
11+
<Badge variant='secondary' className='text-background bg-quantinuum'>
1212
Secondary
1313
</Badge>
1414
</div>

0 commit comments

Comments
 (0)