From a120ce56f66e0930d3c624724dd18b6a1745cea3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 30 Jan 2025 17:24:18 +0000 Subject: [PATCH 1/7] fix(deps): update dependency tailwind-merge to v3 Signed-off-by: Renovate Bot --- summer2024-frontend/package-lock.json | 13 +++++++------ summer2024-frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/summer2024-frontend/package-lock.json b/summer2024-frontend/package-lock.json index 7ce8af9..970788d 100644 --- a/summer2024-frontend/package-lock.json +++ b/summer2024-frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "summer2024-frontend", - "version": "2.0.1", + "version": "2.1.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "summer2024-frontend", - "version": "2.0.1", + "version": "2.1.4", "dependencies": { "@vee-validate/zod": "^4.13.2", "@vueuse/core": "^10.11.0", @@ -21,7 +21,7 @@ "ol-ext": "^4.0.21", "pinia": "^2.1.7", "radix-vue": "^1.9.2", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7", "vee-validate": "^4.13.2", "vue": "^3.4.29", @@ -6047,9 +6047,10 @@ } }, "node_modules/tailwind-merge": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz", - "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.0.tgz", + "integrity": "sha512-y6SRDRD+NJldSrsMcFBL2kuwwlnrzhNFuS6C/NI+dA1sqj7T5S4Jkl7bsltpD45cwEKlWlDnZA5PC+LDtz+vXQ==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/summer2024-frontend/package.json b/summer2024-frontend/package.json index 7671318..b99ee8e 100644 --- a/summer2024-frontend/package.json +++ b/summer2024-frontend/package.json @@ -24,7 +24,7 @@ "ol-ext": "^4.0.21", "pinia": "^2.1.7", "radix-vue": "^1.9.2", - "tailwind-merge": "^2.4.0", + "tailwind-merge": "^3.0.0", "tailwindcss-animate": "^1.0.7", "vee-validate": "^4.13.2", "vue": "^3.4.29", From b1c59923bc1911b49b57fe54c589ce55a6f27991 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 4 Oct 2025 09:42:02 +0700 Subject: [PATCH 2/7] Customize headers --- summer2024-frontend/index.html | 3 +- summer2024-frontend/src/App.vue | 10 +---- .../src/components/PostComponent.vue | 5 ++- .../src/components/WelcomeComponent.vue | 37 +++++++++++-------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/summer2024-frontend/index.html b/summer2024-frontend/index.html index 5310c01..16eef8d 100644 --- a/summer2024-frontend/index.html +++ b/summer2024-frontend/index.html @@ -6,7 +6,8 @@ - carnet de voyage été 2024 - kektus + + Carnet de voyage