Skip to content

Commit acf24c1

Browse files
committed
chore: tailwind v4
1 parent 76c0cda commit acf24c1

File tree

9 files changed

+293
-434
lines changed

9 files changed

+293
-434
lines changed

package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,17 @@
6464
"@hookform/devtools": "^4.3.3",
6565
"@navikt/eslint-config-teamsykmelding": "^7.1.0",
6666
"@playwright/test": "1.50.1",
67+
"@tailwindcss/postcss": "^4.0.10",
6768
"@types/node": "^22.13.9",
6869
"@types/react": "^19.0.10",
6970
"@types/react-dom": "^19.0.4",
70-
"autoprefixer": "^10.4.20",
7171
"eslint": "^8.57.1",
7272
"eslint-config-next": "15.2.1",
7373
"husky": "^9.1.7",
7474
"lint-staged": "^15.4.3",
7575
"postcss": "^8.5.3",
76-
"postcss-import": "^16.1.0",
7776
"prettier": "^3.5.3",
78-
"tailwindcss": "^3.4.17",
77+
"tailwindcss": "^4.0.10",
7978
"typescript": "^5.8.2",
8079
"vite-tsconfig-paths": "^5.1.4",
8180
"vitest": "^3.0.7"

postcss.config.mjs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/** @type {import('postcss-load-config').Config} */
22
const config = {
33
plugins: {
4-
'postcss-import': {},
5-
tailwindcss: {},
6-
autoprefixer: {},
4+
'@tailwindcss/postcss': {},
75
},
86
}
97

src/app/(standalone)/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function Home(): ReactElement {
2626
</div>
2727
</Heading>
2828

29-
<div className="border border-border-subtle p-3 rounded mt-2">
29+
<div className="border border-border-subtle p-3 rounded-sm mt-2">
3030
<Heading size="small" className="-mt-7 bg-white w-fit px-2 py-0">
3131
Metadata
3232
</Heading>

src/app/globals.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'tailwindcss/base';
2-
@import '@navikt/ds-css';
3-
@import 'tailwindcss/components';
4-
@import 'tailwindcss/utilities';
1+
@import 'tailwindcss';
2+
@import '@navikt/ds-css' layer(components);
3+
4+
@config '../../tailwind.config.ts';

src/components/ny-sykmelding-form/diagnose/combobox/AkselifiedCombobox.module.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
right: 0.5rem;
55
height: 2rem;
66
width: 2rem;
7-
@apply p-0 flex justify-center items-center;
7+
padding: 0;
8+
9+
@apply flex justify-center items-center;
810
}
911

1012
.comboboxItem:hover {

src/components/ui/form.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function FormSection({ children, icon, title }: PropsWithChildren<Props>)
1414

1515
return (
1616
<div className="relative">
17-
<section className="p-4 bg-bg-subtle rounded" aria-labelledby={headingId}>
17+
<section className="p-4 bg-bg-subtle rounded-sm" aria-labelledby={headingId}>
1818
<Heading level="2" size="medium" id={headingId} className="flex items-center gap-1">
1919
{icon}
2020
{title}

src/devtools/InternalDevToolItem.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type Props = {
1111

1212
export function DevToolItem({ title, description, children, className }: PropsWithChildren<Props>): ReactElement {
1313
return (
14-
<div className="p-2 border border-border-alt-3 rounded grow">
14+
<div className="p-2 border border-border-alt-3 rounded-sm grow">
1515
<div className="-mt-6">
1616
<Heading level="3" size="xsmall" className="bg-surface-alt-3-subtle p-1 inline-block">
1717
{title}

src/devtools/ScenarioLinks.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { getAbsoluteURL, pathWithBasePath } from '@utils/url'
88

99
function ScenarioLinks(): ReactElement {
1010
return (
11-
<div className="border border-border-subtle p-3 rounded mt-2">
11+
<div className="border border-border-subtle p-3 rounded-sm mt-2">
1212
<Heading level="2" size="small" className="-mt-7 bg-white w-fit px-2 py-0">
1313
Examples
1414
</Heading>

0 commit comments

Comments
 (0)