Skip to content

Commit 3860356

Browse files
committed
Update tailwindcss
1 parent e2c4ae6 commit 3860356

15 files changed

+753
-1051
lines changed

package-lock.json

+632-930
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
},
6262
"devDependencies": {
6363
"@eslint/eslintrc": "^3",
64+
"@tailwindcss/postcss": "^4.0.12",
6465
"@types/node": "^22",
6566
"@types/react": "^19",
6667
"@types/react-dom": "^19",
@@ -69,7 +70,7 @@
6970
"eslint-config-next": "15.2.1",
7071
"postcss": "^8",
7172
"prettier": "^3.5.3",
72-
"tailwindcss": "^3.4.1",
73+
"tailwindcss": "^4.0.12",
7374
"typescript": "^5"
7475
}
7576
}

postcss.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/** @type {import('postcss-load-config').Config} */
22
const config = {
33
plugins: {
4-
tailwindcss: {}
4+
'@tailwindcss/postcss': {}
55
}
66
}
77

src/app/globals.css

+78-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,84 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import 'tailwindcss';
42

5-
body {
6-
font-family: Arial, Helvetica, sans-serif;
3+
@plugin 'tailwindcss-animate';
4+
5+
@custom-variant dark (&:is(.dark *));
6+
7+
@theme {
8+
--color-background: hsl(var(--background));
9+
--color-foreground: hsl(var(--foreground));
10+
11+
--color-card: hsl(var(--card));
12+
--color-card-foreground: hsl(var(--card-foreground));
13+
14+
--color-popover: hsl(var(--popover));
15+
--color-popover-foreground: hsl(var(--popover-foreground));
16+
17+
--color-primary: hsl(var(--primary));
18+
--color-primary-foreground: hsl(var(--primary-foreground));
19+
20+
--color-secondary: hsl(var(--secondary));
21+
--color-secondary-foreground: hsl(var(--secondary-foreground));
22+
23+
--color-muted: hsl(var(--muted));
24+
--color-muted-foreground: hsl(var(--muted-foreground));
25+
26+
--color-accent: hsl(var(--accent));
27+
--color-accent-foreground: hsl(var(--accent-foreground));
28+
29+
--color-destructive: hsl(var(--destructive));
30+
--color-destructive-foreground: hsl(var(--destructive-foreground));
31+
32+
--color-border: hsl(var(--border));
33+
--color-input: hsl(var(--input));
34+
--color-ring: hsl(var(--ring));
35+
36+
--color-chart-1: hsl(var(--chart-1));
37+
--color-chart-2: hsl(var(--chart-2));
38+
--color-chart-3: hsl(var(--chart-3));
39+
--color-chart-4: hsl(var(--chart-4));
40+
--color-chart-5: hsl(var(--chart-5));
41+
42+
--color-sidebar: hsl(var(--sidebar-background));
43+
--color-sidebar-foreground: hsl(var(--sidebar-foreground));
44+
--color-sidebar-primary: hsl(var(--sidebar-primary));
45+
--color-sidebar-primary-foreground: hsl(var(--sidebar-primary-foreground));
46+
--color-sidebar-accent: hsl(var(--sidebar-accent));
47+
--color-sidebar-accent-foreground: hsl(var(--sidebar-accent-foreground));
48+
--color-sidebar-border: hsl(var(--sidebar-border));
49+
--color-sidebar-ring: hsl(var(--sidebar-ring));
50+
51+
--radius-lg: var(--radius);
52+
--radius-md: calc(var(--radius) - 2px);
53+
--radius-sm: calc(var(--radius) - 4px);
754
}
855

9-
code {
10-
color: rgb(0, 255, 0);
56+
/*
57+
The default border color has changed to `currentColor` in Tailwind CSS v4,
58+
so we've added these compatibility styles to make sure everything still
59+
looks the same as it did with Tailwind CSS v3.
60+
61+
If we ever want to remove these styles, we need to add an explicit border
62+
color utility to any element that depends on these defaults.
63+
*/
64+
@layer base {
65+
*,
66+
::after,
67+
::before,
68+
::backdrop,
69+
::file-selector-button {
70+
border-color: var(--color-gray-200, currentColor);
71+
}
72+
}
73+
74+
@layer utilities {
75+
body {
76+
font-family: Arial, Helvetica, sans-serif;
77+
}
78+
79+
code {
80+
color: rgb(0, 255, 0);
81+
}
1182
}
1283

1384
@layer base {

src/components/nav-user.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function NavUser({
5757
</SidebarMenuButton>
5858
</DropdownMenuTrigger>
5959
<DropdownMenuContent
60-
className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
60+
className="w-(--radix-dropdown-menu-trigger-width) min-w-56 rounded-lg"
6161
side={isMobile ? 'bottom' : 'right'}
6262
align="end"
6363
sideOffset={4}>

src/components/ui/button.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import * as React from 'react'
55
import { cn } from '@/lib/utils'
66

77
const buttonVariants = cva(
8-
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
8+
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
99
{
1010
variants: {
1111
variant: {
1212
default:
13-
'bg-primary text-primary-foreground shadow hover:bg-primary/90',
13+
'bg-primary text-primary-foreground shadow-sm hover:bg-primary/90',
1414
destructive:
15-
'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
15+
'bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90',
1616
outline:
17-
'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
17+
'border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground',
1818
secondary:
19-
'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
19+
'bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80',
2020
ghost: 'hover:bg-accent hover:text-accent-foreground',
2121
link: 'text-primary underline-offset-4 hover:underline'
2222
},

src/components/ui/card.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const Card = React.forwardRef<
99
<div
1010
ref={ref}
1111
className={cn(
12-
'rounded-xl border bg-card text-card-foreground shadow',
12+
'rounded-xl border bg-card text-card-foreground shadow-sm',
1313
className
1414
)}
1515
{...props}

src/components/ui/dropdown-menu.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const DropdownMenuSubTrigger = React.forwardRef<
2727
<DropdownMenuPrimitive.SubTrigger
2828
ref={ref}
2929
className={cn(
30-
'flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
30+
'flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden focus:bg-accent data-[state=open]:bg-accent [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
3131
inset && 'pl-8',
3232
className
3333
)}
@@ -83,7 +83,7 @@ const DropdownMenuItem = React.forwardRef<
8383
<DropdownMenuPrimitive.Item
8484
ref={ref}
8585
className={cn(
86-
'relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0',
86+
'relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0',
8787
inset && 'pl-8',
8888
className
8989
)}
@@ -99,7 +99,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
9999
<DropdownMenuPrimitive.CheckboxItem
100100
ref={ref}
101101
className={cn(
102-
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
102+
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50',
103103
className
104104
)}
105105
checked={checked}
@@ -122,7 +122,7 @@ const DropdownMenuRadioItem = React.forwardRef<
122122
<DropdownMenuPrimitive.RadioItem
123123
ref={ref}
124124
className={cn(
125-
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
125+
'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50',
126126
className
127127
)}
128128
{...props}>

src/components/ui/input.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(
88
<input
99
type={type}
1010
className={cn(
11-
'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
11+
'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-base shadow-xs transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
1212
className
1313
)}
1414
ref={ref}

src/components/ui/select.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const SelectTrigger = React.forwardRef<
1919
<SelectPrimitive.Trigger
2020
ref={ref}
2121
className={cn(
22-
'flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
22+
'flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-xs ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1',
2323
className
2424
)}
2525
{...props}>
@@ -113,7 +113,7 @@ const SelectItem = React.forwardRef<
113113
<SelectPrimitive.Item
114114
ref={ref}
115115
className={cn(
116-
'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
116+
'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-hidden focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50',
117117
className
118118
)}
119119
{...props}>

src/components/ui/sheet.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const SheetContent = React.forwardRef<
6363
ref={ref}
6464
className={cn(sheetVariants({ side }), className)}
6565
{...props}>
66-
<SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
66+
<SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
6767
<X className="h-4 w-4" />
6868
<span className="sr-only">Close</span>
6969
</SheetPrimitive.Close>

0 commit comments

Comments
 (0)