File tree Expand file tree Collapse file tree 5 files changed +23
-8
lines changed Expand file tree Collapse file tree 5 files changed +23
-8
lines changed Original file line number Diff line number Diff line change 1
1
import { forwardRef } from "react"
2
2
import type { IconType } from "react-icons"
3
3
4
- import { Button , type ButtonProps } from "@/components/ui/button"
4
+ import {
5
+ Button ,
6
+ type ButtonProps ,
7
+ } from "../../../../tailwind/ui/buttons/Button"
5
8
6
9
type FooterButtonProps = ButtonProps & {
7
10
icon : IconType
Original file line number Diff line number Diff line change @@ -2,10 +2,13 @@ import { forwardRef } from "react"
2
2
import { motion } from "framer-motion"
3
3
import { useTranslation } from "next-i18next"
4
4
5
- import { Button , type ButtonProps } from "@/components/ui/button"
6
-
7
5
import { HAMBURGER_BUTTON_ID } from "@/lib/constants"
8
6
7
+ import {
8
+ Button ,
9
+ type ButtonProps ,
10
+ } from "../../../../tailwind/ui/buttons/Button"
11
+
9
12
const hamburgerSvg =
10
13
"M 2 13 l 10 0 l 0 0 l 10 0 M 4 19 l 8 0 M 12 19 l 8 0 M 2 25 l 10 0 l 0 0 l 10 0"
11
14
const glyphSvg =
Original file line number Diff line number Diff line change @@ -2,13 +2,12 @@ import { useState } from "react"
2
2
import { useRouter } from "next/router"
3
3
import * as AccordionPrimitive from "@radix-ui/react-accordion"
4
4
5
- import { Button } from "@/components/ui/button"
6
-
7
5
import { cn } from "@/lib/utils/cn"
8
6
import { trackCustomEvent } from "@/lib/utils/matomo"
9
7
import { cleanPath } from "@/lib/utils/url"
10
8
11
9
import { BaseLink } from "../../../../tailwind/Link"
10
+ import { Button } from "../../../../tailwind/ui/buttons/Button"
12
11
import type { Level , NavItem , NavSectionKey } from "../types"
13
12
14
13
import ExpandIcon from "./ExpandIcon"
Original file line number Diff line number Diff line change 1
- import { ButtonProps } from "@/components/ui/button"
2
1
import {
3
2
Sheet ,
4
3
SheetContent ,
7
6
SheetTrigger ,
8
7
} from "@/components/ui/sheet"
9
8
9
+ import { ButtonProps } from "../../../../tailwind/ui/buttons/Button"
10
10
import type { NavSections } from "../types"
11
11
12
12
import HamburgerButton from "./HamburgerButton"
Original file line number Diff line number Diff line change @@ -4,14 +4,24 @@ import * as SheetPrimitive from "@radix-ui/react-dialog"
4
4
5
5
import { cn } from "@/lib/utils/cn"
6
6
7
+ import { Button } from "../../../tailwind/ui/buttons/Button"
8
+
7
9
const Sheet = SheetPrimitive . Root
8
10
9
11
const SheetTrigger = SheetPrimitive . Trigger
10
12
11
- const SheetClose = SheetPrimitive . Close
12
-
13
13
const SheetPortal = SheetPrimitive . Portal
14
14
15
+ const SheetClose = React . forwardRef <
16
+ React . ElementRef < typeof SheetPrimitive . Close > ,
17
+ React . ComponentPropsWithoutRef < typeof SheetPrimitive . Close >
18
+ > ( ( props , ref ) => (
19
+ < SheetPrimitive . Close ref = { ref } asChild >
20
+ < Button variant = "ghost" isSecondary { ...props } />
21
+ </ SheetPrimitive . Close >
22
+ ) )
23
+ SheetClose . displayName = SheetPrimitive . Close . displayName
24
+
15
25
const SheetOverlay = React . forwardRef <
16
26
React . ElementRef < typeof SheetPrimitive . Overlay > ,
17
27
React . ComponentPropsWithoutRef < typeof SheetPrimitive . Overlay >
You can’t perform that action at this time.
0 commit comments