Skip to content

Commit 91bf959

Browse files
committed
Migrate to tailwind v4
1 parent 5e796ee commit 91bf959

21 files changed

Lines changed: 423 additions & 610 deletions

astro.config.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import react from "@astrojs/react";
2-
import tailwind from "@astrojs/tailwind";
32
import icon from "astro-icon";
43
import { defineConfig } from "astro/config";
4+
import tailwindcss from "@tailwindcss/vite";
55

66
// https://astro.build/config
77
export default defineConfig({
88
site: "http://www.monkeytechdays.com",
9-
integrations: [tailwind(), icon(), react()],
9+
integrations: [icon(), react()],
10+
vite: {
11+
plugins: [tailwindcss()],
12+
},
1013
});

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"dependencies": {
1313
"@astrojs/check": "0.9.4",
1414
"@astrojs/react": "4.3.0",
15-
"@astrojs/tailwind": "6.0.2",
16-
"@fontsource/saira": "5.2.8",
15+
"@fontsource-variable/saira": "5.2.8",
16+
"@tailwindcss/vite": "4.1.11",
1717
"@types/react": "19.1.8",
1818
"@types/react-dom": "19.1.6",
1919
"astro": "5.12.1",
@@ -25,8 +25,8 @@
2525
"react": "19.1.0",
2626
"react-dom": "19.1.0",
2727
"sharp": "0.34.3",
28-
"tailwind-merge": "2.5.5",
29-
"tailwindcss": "3.4.16",
28+
"tailwind-merge": "3.3.1",
29+
"tailwindcss": "4.1.11",
3030
"typescript": "5.8.3"
3131
},
3232
"devDependencies": {

pnpm-lock.yaml

Lines changed: 365 additions & 576 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/BaseHead.astro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
2-
import "@fontsource/saira";
3-
import { ClientRouter } from 'astro:transitions';
2+
import "@fontsource-variable/saira";
3+
import { ClientRouter } from "astro:transitions";
44
import { SITE_TITLE } from "../consts";
5+
import "../styles/global.css";
56
67
interface Props {
78
title?: string;

src/components/index/About.astro

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import Teamwork from "./teamwork.jpg";
77

88
<section>
99
<div class="container m-auto px-4 py-8">
10-
<h1 class="mb-4 text-center text-4xl font-bold text-main-900">A propos</h1>
10+
<h1 class="text-main-900 mb-4 text-center text-4xl font-medium">
11+
A propos
12+
</h1>
1113
<p class="mb-2 text-center text-2xl">
1214
Rassembler des TechAddicts pour évaluer des technos Innovantes
1315
</p>

src/components/index/CTAs.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import ThemeImg from "../../assets/theme.jpg";
99
<div class="flex flex-wrap justify-around gap-2">
1010
<div class="space-y-1">
1111
<h2 class="text-xl">Envie d'expérimenter une techno ?</h2>
12-
<div class="grid [grid-template-areas:'stack'] [&>*]:[grid-area:stack]">
12+
<div class="grid [grid-template-areas:'stack'] *:[grid-area:stack]">
1313
<a
1414
rel="noopener"
1515
href="https://github.com/monkeytechdays/cfp/issues/new"
@@ -21,7 +21,7 @@ import ThemeImg from "../../assets/theme.jpg";
2121
</div>
2222
<div class="space-y-1">
2323
<h2 class="text-xl">Envie de sponsoriser un event ?</h2>
24-
<div class="grid [grid-template-areas:'stack'] [&>*]:[grid-area:stack]">
24+
<div class="grid [grid-template-areas:'stack'] *:[grid-area:stack]">
2525
<a
2626
href="mailto:mktd@monkeypatch.io?subject=Devenir Sponsor MonkeyTechDays"
2727
class="z-10 mb-2 self-end bg-[#e5b491] py-2 text-center text-black hover:opacity-80"

src/components/index/Free.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<section class="bg-main-900 text-white">
22
<div class="container m-auto px-4 py-8">
3-
<div class="text-center text-2xl font-bold">Et en plus !</div>
3+
<div class="text-center text-2xl font-medium">Et en plus !</div>
44
<div class="m-4">
55
<div class="flex flex-col items-center py-4">
6-
<div class="text-3xl font-bold">C'est 100% GRATUIT</div>
6+
<div class="text-3xl font-medium">C'est 100% GRATUIT</div>
77
<div class="text-xl">pour tout les participants</div>
88
</div>
99
<div class="mt-2 text-center">

src/components/index/GlowingEffect.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const GlowingEffect = ({
3939
backgroundSize: animate ? "400% 400%" : undefined,
4040
}}
4141
className={cn(
42-
"absolute inset-0 z-[1] rounded-sm opacity-60 blur-xl transition duration-500 group-hover:opacity-100",
42+
"absolute inset-0 z-1 rounded-sm opacity-60 blur-xl transition duration-500 group-hover:opacity-100",
4343
" bg-[radial-gradient(circle_farthest-side_at_0_100%,#00ccb1,transparent),radial-gradient(circle_farthest-side_at_100%_0,#7b61ff,transparent),radial-gradient(circle_farthest-side_at_100%_100%,#ffc414,transparent),radial-gradient(circle_farthest-side_at_0_0,#1ca0fb,#141316)]",
4444
)}
4545
/>
@@ -60,7 +60,7 @@ export const GlowingEffect = ({
6060
backgroundSize: animate ? "400% 400%" : undefined,
6161
}}
6262
className={cn(
63-
"absolute inset-0 z-[1] rounded-sm",
63+
"absolute inset-0 z-1 rounded-sm",
6464
"bg-[radial-gradient(circle_farthest-side_at_0_100%,#00ccb1,transparent),radial-gradient(circle_farthest-side_at_100%_0,#7b61ff,transparent),radial-gradient(circle_farthest-side_at_100%_100%,#ffc414,transparent),radial-gradient(circle_farthest-side_at_0_0,#1ca0fb,#141316)]",
6565
)}
6666
/>

src/components/index/Hero.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import LogoFull from "./logo_full.png";
55
---
66

77
<div
8-
class="grid [grid-template-areas:'stack'] before:pointer-events-none before:absolute before:h-full before:w-full before:bg-gradient-to-b before:from-black before:from-0% before:to-transparent before:to-35% [&>*]:[grid-area:stack]"
8+
class="grid [grid-template-areas:'stack'] before:pointer-events-none before:absolute before:h-full before:w-full before:bg-linear-to-b before:from-black before:from-0% before:to-transparent before:to-35% *:[grid-area:stack]"
99
>
1010
<Picture
1111
src={Illus}

src/components/index/PreviousSessions.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const events = (await getCollection("mktds"))
99

1010
<section>
1111
<div class="container m-auto px-4 py-8">
12-
<h1 class="mb-4 text-center text-4xl font-bold text-main-900">
12+
<h1 class="text-main-900 mb-4 text-center text-4xl font-medium">
1313
Précédents rendez-vous
1414
</h1>
1515
<div class="mt-4 flex flex-wrap justify-center gap-6">

0 commit comments

Comments
 (0)