diff --git a/.vscode/settings.json b/.vscode/settings.json index 799580a..7e439e4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "cSpell.words": [ "approximative", + "Armes", "colour", "colours", "contactez", diff --git a/app/[lang]/components/Hamburger.tsx b/app/[lang]/components/Hamburger.tsx index 09df03c..b509c95 100644 --- a/app/[lang]/components/Hamburger.tsx +++ b/app/[lang]/components/Hamburger.tsx @@ -1,7 +1,9 @@ "use client"; -import HamburgerMenu from "./HamburgerMenu"; import { useRef, useState } from "react"; +import { twMerge } from "tailwind-merge"; + +import HamburgerMenu from "./HamburgerMenu"; const Hamburger = () => { const [menuVisible, setMenuVisible] = useState(false); @@ -15,19 +17,23 @@ const Hamburger = () => { onClick={() => setMenuVisible(!menuVisible)} >
diff --git a/app/[lang]/components/HamburgerMenu.tsx b/app/[lang]/components/HamburgerMenu.tsx index 2892e16..4b1077f 100644 --- a/app/[lang]/components/HamburgerMenu.tsx +++ b/app/[lang]/components/HamburgerMenu.tsx @@ -5,6 +5,7 @@ interface HamburgerMenuState { } import { Dispatch, RefObject, SetStateAction, useRef, useState } from "react"; +import { twMerge } from "tailwind-merge"; import Link from "next-intl/link"; import { useTranslations } from "next-intl"; @@ -51,14 +52,16 @@ const HamburgerMenu = ({ return (