Skip to content

Commit c64f1d3

Browse files
committed
set the config to "" as tailwind config no longer exist in tailwind v4 and fixed the colors
1 parent 7beae4d commit c64f1d3

File tree

3 files changed

+73
-59
lines changed

3 files changed

+73
-59
lines changed

app/components/ui/status-button.tsx

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,13 @@ export const StatusButton = ({
1515
className,
1616
children,
1717
spinDelay,
18-
size,
19-
variant,
2018
...props
21-
}: React.ComponentProps<'button'> & {
22-
status: 'pending' | 'success' | 'error' | 'idle'
23-
message?: string | null
24-
spinDelay?: Parameters<typeof useSpinDelay>[1]
25-
size?: ButtonVariant['size']
26-
variant?: ButtonVariant['variant']
27-
}) => {
19+
}: React.ComponentProps<'button'> &
20+
ButtonVariant & {
21+
status: 'pending' | 'success' | 'error' | 'idle'
22+
message?: string | null
23+
spinDelay?: Parameters<typeof useSpinDelay>[1]
24+
}) => {
2825
const delayedPending = useSpinDelay(status === 'pending', {
2926
delay: 400,
3027
minDuration: 300,
@@ -63,12 +60,7 @@ export const StatusButton = ({
6360
}[status]
6461

6562
return (
66-
<Button
67-
className={cn('flex justify-center gap-4', className)}
68-
variant={variant}
69-
size={size}
70-
{...props}
71-
>
63+
<Button className={cn('flex justify-center gap-4', className)} {...props}>
7264
<div>{children}</div>
7365
{message ? (
7466
<TooltipProvider>

app/styles/tailwind.css

Lines changed: 61 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,72 @@
55

66
:root {
77
--radius: 0.5rem;
8-
--background: oklch(1 0 0);
9-
--foreground: oklch(0.129 0.042 264.695);
10-
--card: oklch(1 0 0);
11-
--card-foreground: oklch(0.129 0.042 264.695);
12-
--popover: oklch(1 0 0);
13-
--popover-foreground: oklch(0.129 0.042 264.695);
14-
--primary: oklch(0.208 0.042 265.755);
15-
--primary-foreground: oklch(0.984 0.003 247.858);
16-
--secondary: oklch(0.968 0.007 247.896);
17-
--secondary-foreground: oklch(0.208 0.042 265.755);
18-
--muted: oklch(0.968 0.007 247.896);
19-
--muted-foreground: oklch(0.554 0.046 257.417);
20-
--accent: oklch(0.968 0.007 247.896);
21-
--accent-foreground: oklch(0.208 0.042 265.755);
22-
--destructive: oklch(0.577 0.245 27.325);
23-
--border: oklch(0.929 0.013 255.508);
24-
--input: oklch(0.929 0.013 255.508);
25-
--ring: oklch(0.704 0.04 256.788);
268

9+
--background: oklch(100% 0 0);
10+
--foreground: oklch(13.71% 0.036 258.53);
2711

28-
--foreground-destructive: oklch(51.46% 0.1979 16.57);
12+
--card: oklch(100% 0 0);
13+
--card-foreground: oklch(13.71% 0.036 258.53);
14+
15+
--popover: oklch(100% 0 0);
16+
--popover-foreground: oklch(13.71% 0.036 258.53);
17+
18+
--primary: oklch(20.79% 0.0399 265.73);
19+
--primary-foreground: oklch(98.38% 0.0035 247.86);
20+
21+
--secondary: oklch(86.48% 0.0153 248);
22+
--secondary-foreground: oklch(20.79% 0.0399 265.73);
23+
24+
--muted: oklch(94.32% 0.0123 247.96);
25+
--muted-foreground: oklch(40.68% 0.0281 257.44);
26+
27+
--accent: oklch(91.87% 0.01770618193703561 248.02064625050508);
28+
--accent-foreground: oklch(20.79% 0.0399 265.73);
29+
30+
--border: oklch(92.9% 0.0126 255.53);
31+
--input: oklch(92.56% 0.0133 255.54);
2932
--input-invalid: oklch(63.68% 0.2078 25.33);
30-
--destructive-foreground: oklch(98.38% 0.0035 247.86)
33+
34+
--destructive: oklch(57.14% 0.2121 27.25);
35+
--destructive-foreground: oklch(98.38% 0.0035 247.86);
36+
/* prefixed with foreground because it should look good on the background */
37+
--foreground-destructive: oklch(51.46% 0.1979 16.57);
38+
39+
--ring: oklch(71.07% 0.0351 256.79);
3140
}
3241

3342
.dark {
34-
--background: oklch(0.129 0.042 264.695);
35-
--foreground: oklch(0.984 0.003 247.858);
36-
--card: oklch(0.208 0.042 265.755);
37-
--card-foreground: oklch(0.984 0.003 247.858);
38-
--popover: oklch(0.208 0.042 265.755);
39-
--popover-foreground: oklch(0.984 0.003 247.858);
40-
--primary: oklch(0.929 0.013 255.508);
41-
--primary-foreground: oklch(0.208 0.042 265.755);
42-
--secondary: oklch(0.279 0.041 260.031);
43-
--secondary-foreground: oklch(0.984 0.003 247.858);
44-
--muted: oklch(0.279 0.041 260.031);
45-
--muted-foreground: oklch(0.704 0.04 256.788);
46-
--accent: oklch(0.279 0.041 260.031);
47-
--accent-foreground: oklch(0.984 0.003 247.858);
48-
--destructive: oklch(0.704 0.191 22.216);
49-
--border: oklch(1 0 0 / 10%);
50-
--input: oklch(1 0 0 / 15%);
51-
--ring: oklch(0.551 0.027 264.364);
43+
--background: oklch(13.71% 0.036 258.53);
44+
--foreground: oklch(98.38% 0.0035 247.86);
5245

53-
/* prefixed with foreground because it should look good on the background */
54-
--foreground-destructive: oklch(63.72% 0.2071 21.89);
46+
--card: oklch(13.71% 0.036 258.53);
47+
--card-foreground: oklch(98.38% 0.0035 247.86);
48+
49+
--popover: oklch(13.71% 0.036 258.53);
50+
--popover-foreground: oklch(98.38% 0.0035 247.86);
51+
52+
--primary: oklch(98.38% 0.0035 247.86);
53+
--primary-foreground: oklch(20.79% 0.0399 265.73);
54+
55+
--secondary: oklch(34.74% 0.0295 260.13);
56+
--secondary-foreground: oklch(98.38% 0.0035 247.86);
57+
58+
--muted: oklch(22.6% 0.0267 260.02);
59+
--muted-foreground: oklch(71.07% 0.0351 256.79);
60+
61+
--accent: oklch(20.56% 0.022816 260.0464);
62+
--accent-foreground: oklch(98.38% 0.0035 247.86);
63+
64+
--border: oklch(28% 0.0369 259.97);
65+
--input: oklch(28% 0.0369 259.97);
5566
--input-invalid: oklch(39.59% 0.1331 25.72);
67+
68+
--destructive: oklch(47.6% 0.159 25.64);
5669
--destructive-foreground: oklch(97.1% 0.0127 17.38);
70+
/* prefixed with foreground because it should look good on the background */
71+
--foreground-destructive: oklch(63.72% 0.2071 21.89);
72+
73+
--ring: oklch(65.28% 0.0684 260.07);
5774
}
5875

5976
@theme inline {
@@ -79,6 +96,9 @@
7996
--color-border: var(--border);
8097
--color-input: var(--input);
8198
--color-ring: var(--ring);
99+
--color-input-invalid: var(--input-invalid);
100+
--color-destructive-foreground: var(--destructive-foreground);
101+
--color-foreground-destructive: var(--foreground-destructive);
82102
}
83103

84104
@theme {
@@ -180,7 +200,7 @@
180200
}
181201

182202
@utility container {
183-
margin-inline: center;
203+
margin-inline: auto;
184204
padding-inline: 2rem;
185205

186206
@media(width >=1400px) {

components.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22
"$schema": "https://ui.shadcn.com/schema.json",
33
"style": "default",
44
"rsc": false,
5+
"tsx": true,
56
"tailwind": {
6-
"config": "tailwind.config.ts",
7+
"config": "",
78
"css": "app/styles/tailwind.css",
89
"baseColor": "slate",
910
"cssVariables": true
1011
},
1112
"aliases": {
1213
"components": "#app/components",
13-
"utils": "#app/utils/misc.tsx",
14-
"ui": "#app/components/ui"
14+
"utils": "#app/utils/misc",
15+
"ui": "#app/components/ui",
16+
"lib": "#app/utils"
1517
}
1618
}

0 commit comments

Comments
 (0)