Upgrade to tailwind v4

This commit is contained in:
Simon Martens
2025-01-29 17:58:44 +01:00
parent 611f7a0882
commit 0e8891170e
9 changed files with 564 additions and 1148 deletions

File diff suppressed because one or more lines are too long

View File

@@ -30,7 +30,7 @@
</head>
<body class="w-full" hx-ext="response-targets" hx-boost="true">
<div class="container flex flex-col min-h-screen max-w-screen-2xl mx-auto">
<div class="container flex flex-col min-h-screen max-w-(--breakpoint-2xl) mx-auto">
<header>
{{ block "_header" . }}
<!-- Default app header... -->

1628
views/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,8 +6,8 @@
"scripts": {
"dev": "vite",
"build": "vite build",
"tailwind": "tailwindcss -i transform/site.css -o assets/style.css",
"css": "postcss transform/site.css -o assets/style.css",
"tailwind": "tailwindcss -i transform/site.css -o assets/style.css",
"css": "postcss transform/site.css -o assets/style.css",
"preview": "vite preview"
},
"repository": {
@@ -22,12 +22,12 @@
"author": "Simon Martens",
"license": "MIT",
"devDependencies": {
"autoprefixer": "^10.4.20",
"@tailwindcss/postcss": "^4.0.0",
"postcss": "^8.4.47",
"postcss-cli": "^11.0.0",
"prettier": "^3.3.3",
"prettier-plugin-go-template": "^0.0.15",
"tailwindcss": "^3.4.13",
"vite": "^6.0.0",
"postcss-cli": "^11.0.0"
"tailwindcss": "^4.0.0",
"vite": "^6.0.0"
}
}

View File

@@ -1,8 +1,5 @@
export default {
plugins: {
"postcss-import": {},
"tailwindcss/nesting": {},
tailwindcss: {},
autoprefixer: {},
'@tailwindcss/postcss': {},
},
};

View File

@@ -28,7 +28,7 @@
{{ range $issue := $month }}
<div class="col-span-1 bg-slate-100 px-2 py-1.5">
{{ $date := $issue.Datum.When }}
<a class="!no-underline" href="/{{ $y }}/{{ $issue.Number.No }}">
<a class="no-underline!" href="/{{ $y }}/{{ $issue.Number.No }}">
<div class="">
{{ $issue.Number.No }}
</div>

View File

@@ -30,7 +30,7 @@
<div class="flex gap-x-2 flex-row">
<a href="/akteure/{{ $a.ID }}" class="!no-underline"><i class="ri-links-line"></i></a>
<a href="/akteure/{{ $a.ID }}" class="no-underline!"><i class="ri-links-line"></i></a>
{{- if ne $gnd nil -}}
<a href="{{ $a.GND }}" target="_blank">GND &rarr;</a>

View File

@@ -1,19 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
"./routes/**/*.{html,js,svelte,ts,tmpl,gotmpl,gohtml}",
"./layouts/**/*.{html,js,svelte,ts,tmpl,gotmpl,gohtml}",
"./transform/**/*.{html,js,svelte,ts,tmpl,gotmpl,gohtml}",
"./public/**/*.{html,js,svelte,ts,tmpl,gotmpl,gohtml,xsl}",
],
theme: {
extend: {
fontFamily: {
script: ["Rancho", "ui-serif"],
sans: ['"Source Sans 3"', '"Merriweather Sans"', "ui-sans-serif"],
serif: ['"Merriweather"', "ui-serif"],
},
},
},
plugins: [],
};

View File

@@ -1,6 +1,32 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';
@theme {
--font-script: Rancho, ui-serif;
--font-sans: 'Source Sans 3', 'Merriweather Sans', ui-sans-serif;
--font-serif: 'Merriweather', ui-serif;
}
/*
The default border color has changed to `currentColor` in Tailwind CSS v4,
so we've added these compatibility styles to make sure everything still
looks the same as it did with Tailwind CSS v3.
If we ever want to remove these styles, we need to add an explicit border
color utility to any element that depends on these defaults.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentColor);
}
}
@utility font-variant-small-caps {
font-variant-caps: small-caps;
}
@layer base {
}
@@ -34,14 +60,10 @@
}
a[aria-current="page"] {
@apply !text-red-500;
}
.font-variant-small-caps {
font-variant-caps: small-caps;
@apply text-red-500!;
}
main {
@apply flex-grow shrink-0;
@apply grow shrink-0;
}
}