diff --git a/src/components/BaseStories/Accordion.stories.tsx b/src/components/BaseStories/Accordion.stories.tsx deleted file mode 100644 index fc3c9f50ee1..00000000000 --- a/src/components/BaseStories/Accordion.stories.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import { - Accordion, - AccordionButton, - AccordionIcon, - AccordionItem, - AccordionPanel, - Box, -} from "@chakra-ui/react" -import { Meta, StoryObj } from "@storybook/react" - -const meta = { - title: "Molecules / Disclosure Content / Accordions", - component: Accordion, - decorators: [ - (Story) => ( - - - - ), - ], -} satisfies Meta - -export default meta - -type Story = StoryObj - -export const Basic: Story = { - render: () => ( - - -

- - - Label text of the accordion - - - -

- - Ethereum is open access to digital money and data-friendly services - for everyone – no matter your background or location. It's a - community-built technology behind the cryptocurrency ether (ETH) and - thousands of applications you can use today. - -
- -

- - - Label text of the accordion - - - -

- - Ethereum is open access to digital money and data-friendly services - for everyone – no matter your background or location. It's a - community-built technology behind the cryptocurrency ether (ETH) and - thousands of applications you can use today. - -
-
- ), -} diff --git a/src/components/BaseStories/Checkbox.stories.tsx b/src/components/BaseStories/Checkbox.stories.tsx deleted file mode 100644 index 52666cab2f5..00000000000 --- a/src/components/BaseStories/Checkbox.stories.tsx +++ /dev/null @@ -1,68 +0,0 @@ -import * as React from "react" -import { - Checkbox as CheckboxComponent, - CheckboxGroup, - type CheckboxProps, - VStack, -} from "@chakra-ui/react" -import { Meta, type StoryObj } from "@storybook/react" - -const meta = { - title: "Atoms / Form / Checkbox", - component: CheckboxComponent, - parameters: { - controls: { - hideNoControlsWarning: true, - expanded: false, - }, - }, -} satisfies Meta - -export default meta - -const DEFAULT_VAL = "checked" - -const checkboxDataSet: CheckboxProps[] = [ - { - value: DEFAULT_VAL, - children: "defaultValue", - }, - { - value: "disabled", - isDisabled: true, - children: "isDisabled", - }, - { - value: "focusable", - isFocusable: true, - isDisabled: true, - children: "isFocusable", - }, - { - value: "read-only", - isReadOnly: true, - children: "isReadOnly", - }, - { - value: "required", - isRequired: true, - children: "isRequired", - }, - { - value: "invalid", - isInvalid: true, - children: "isInvalid", - }, -] - -export const Checkbox: StoryObj = { - render: () => ( - - - {checkboxDataSet.map((props) => ( - - ))} - - - ), -} diff --git a/src/components/BaseStories/Radio.stories.tsx b/src/components/BaseStories/Radio.stories.tsx deleted file mode 100644 index bff94799a01..00000000000 --- a/src/components/BaseStories/Radio.stories.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import * as React from "react" -import { Flex, Radio as RadioComponent, RadioGroup } from "@chakra-ui/react" -import { Meta, StoryObj } from "@storybook/react" - -const meta = { - title: "Atoms / Form / Radio", - component: RadioComponent, - argTypes: { - flexDirection: { - options: ["column", "row"], - control: { type: "radio" }, - }, - }, - parameters: { - controls: { - hideNoControlsWarning: true, - expanded: false, - }, - }, -} satisfies Meta - -export default meta - -type Story = StoryObj - -export const Radio: Story = { - args: { - flexDirection: "column", - }, - argTypes: { - value: { - options: ["checked", "disabled", "focusable", "read-only", "required"], - control: { - type: "radio", - }, - }, - }, - render: ({ flexDirection, value }) => ( - - - defaultValue - - isDisabled - - - isFocusable and disabled - - - isReadOnly - - - isRequired - - - isInvalid - - - - ), -} diff --git a/src/components/BaseStories/Switch.stories.tsx b/src/components/BaseStories/Switch.stories.tsx deleted file mode 100644 index 5c3274d3643..00000000000 --- a/src/components/BaseStories/Switch.stories.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import * as React from "react" -import { SimpleGrid, Switch as SwitchComponent } from "@chakra-ui/react" -import { Meta, type StoryObj } from "@storybook/react" - -const meta = { - title: "Atoms / Form / Switch", - component: SwitchComponent, - parameters: { - controls: { - hideNoControlsWarning: true, - expanded: false, - }, - }, -} satisfies Meta - -export default meta - -export const Switch: StoryObj = { - render: () => ( - - isChecked: - - - isDisabled and checked: - - - isFocusable & isDisabled: - - - isReadOnly: - - - isRequired: - - - ), -} diff --git a/src/components/DataTable/index.tsx b/src/components/DataTable/index.tsx index 38a0bcc47ba..f29f2abe87f 100644 --- a/src/components/DataTable/index.tsx +++ b/src/components/DataTable/index.tsx @@ -14,7 +14,7 @@ import { TableHeader, TableProps, TableRow, -} from "@/components/ui/Table" +} from "@/components/ui/table" import { trackCustomEvent } from "@/lib/utils/matomo" diff --git a/src/components/ExpandableCard.tsx b/src/components/ExpandableCard.tsx index acbaf13f212..448898ef6c2 100644 --- a/src/components/ExpandableCard.tsx +++ b/src/components/ExpandableCard.tsx @@ -5,14 +5,13 @@ import { Flex, HStack, VStack } from "@/components/ui/flex" import { trackCustomEvent } from "@/lib/utils/matomo" +import type { IconBaseType } from "./icons/icon-base" import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, -} from "../../tailwind/ui/accordion" - -import type { IconBaseType } from "./icons/icon-base" +} from "./ui/accordion" export type ExpandableCardProps = { children?: ReactNode diff --git a/src/components/FindWalletProductTable/hooks/useWalletColumns.tsx b/src/components/FindWalletProductTable/hooks/useWalletColumns.tsx index 1ba454555ba..e1dac26a2ac 100644 --- a/src/components/FindWalletProductTable/hooks/useWalletColumns.tsx +++ b/src/components/FindWalletProductTable/hooks/useWalletColumns.tsx @@ -7,7 +7,7 @@ import { Wallet } from "@/lib/types" import type { TableMeta } from "@/components/DataTable" import WalletInfo from "@/components/FindWalletProductTable/WalletInfo" import { Button } from "@/components/ui/buttons/Button" -import { TableCell } from "@/components/ui/Table" +import { TableCell } from "@/components/ui/table" import { trackCustomEvent } from "@/lib/utils/matomo" diff --git a/src/components/Layer2NetworksTable/NetworksWalletSelectInput.tsx b/src/components/Layer2NetworksTable/NetworksWalletSelectInput.tsx index c2638146412..06db74e32e4 100644 --- a/src/components/Layer2NetworksTable/NetworksWalletSelectInput.tsx +++ b/src/components/Layer2NetworksTable/NetworksWalletSelectInput.tsx @@ -2,7 +2,7 @@ import { useState } from "react" import { FilterInputState } from "@/lib/types" -import { Input } from "@/components/ui/input" +import Input from "@/components/ui/input" import { Select, SelectContent, diff --git a/src/components/Layer2NetworksTable/hooks/useNetworkColumns.tsx b/src/components/Layer2NetworksTable/hooks/useNetworkColumns.tsx index e45ec6abab3..ed4b630b8b5 100644 --- a/src/components/Layer2NetworksTable/hooks/useNetworkColumns.tsx +++ b/src/components/Layer2NetworksTable/hooks/useNetworkColumns.tsx @@ -12,7 +12,7 @@ import NetworkMaturityTooltip from "@/components/Layer2NetworksTable/NetworkMatu import InlineLink from "@/components/Link" import Tooltip from "@/components/Tooltip" import { Button } from "@/components/ui/buttons/Button" -import { TableCell, TableHead } from "@/components/ui/Table" +import { TableCell, TableHead } from "@/components/ui/table" import { cn } from "@/lib/utils/cn" import { trackCustomEvent } from "@/lib/utils/matomo" diff --git a/src/components/MatomoOptOut.tsx b/src/components/MatomoOptOut.tsx index b26c4882503..a46196a37a0 100644 --- a/src/components/MatomoOptOut.tsx +++ b/src/components/MatomoOptOut.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react" import { MATOMO_LS_KEY } from "@/lib/utils/matomo" -import Checkbox from "../../tailwind/ui/Checkbox" +import Checkbox from "./ui/checkbox" const MatomoOptOut = () => { const [loading, setLoading] = useState(true) diff --git a/src/components/MdComponents/index.tsx b/src/components/MdComponents/index.tsx index 8b46c4e2dac..11737ec8269 100644 --- a/src/components/MdComponents/index.tsx +++ b/src/components/MdComponents/index.tsx @@ -26,7 +26,7 @@ import { ButtonLink } from "../ui/buttons/Button" import { Divider } from "../ui/divider" import { Flex } from "../ui/flex" import { ListItem, OrderedList, UnorderedList } from "../ui/list" -import { mdxTableComponents } from "../ui/Table" +import { mdxTableComponents } from "../ui/table" import { Tag } from "../ui/tag" export const commonHeadingAttributes = (className: string, id?: string) => ({ diff --git a/src/components/MeetupList.tsx b/src/components/MeetupList.tsx index 89f9df8994b..a792bcdb082 100644 --- a/src/components/MeetupList.tsx +++ b/src/components/MeetupList.tsx @@ -11,9 +11,8 @@ import { trackCustomEvent } from "@/lib/utils/matomo" import meetups from "@/data/community-meetups.json" -import Input from "../../tailwind/ui/Input" - import { Flex } from "./ui/flex" +import Input from "./ui/input" import InlineLink, { BaseLink } from "./ui/Link" export interface Meetup { diff --git a/src/components/Nav/Mobile/MenuAccordion.tsx b/src/components/Nav/Mobile/MenuAccordion.tsx index 53de4beccb4..f9a3ef3db3a 100644 --- a/src/components/Nav/Mobile/MenuAccordion.tsx +++ b/src/components/Nav/Mobile/MenuAccordion.tsx @@ -2,11 +2,7 @@ import * as AccordionPrimitive from "@radix-ui/react-accordion" import { cn } from "@/lib/utils/cn" -import { - Accordion, - AccordionContent, - AccordionItem, -} from "../../../../tailwind/ui/accordion" +import { Accordion, AccordionContent, AccordionItem } from "../../ui/accordion" type AccordionTriggerProps = { heading?: "h1" | "h2" | "h3" | "h4" | "h5" | "h6" diff --git a/src/components/ProductTable/FilterInputs/CheckboxFilterInput.tsx b/src/components/ProductTable/FilterInputs/CheckboxFilterInput.tsx index 6b26e0da584..be6277e7e0c 100644 --- a/src/components/ProductTable/FilterInputs/CheckboxFilterInput.tsx +++ b/src/components/ProductTable/FilterInputs/CheckboxFilterInput.tsx @@ -1,6 +1,6 @@ import { FilterInputState } from "@/lib/types" -import Checkbox from "@/../tailwind/ui/Checkbox" +import Checkbox from "@/components/ui/checkbox" interface CheckboxFilterInputProps { label: string diff --git a/src/components/ProductTable/FilterInputs/SwitchFilterInput.tsx b/src/components/ProductTable/FilterInputs/SwitchFilterInput.tsx index 37af6de0bdc..3c8b3d4685b 100644 --- a/src/components/ProductTable/FilterInputs/SwitchFilterInput.tsx +++ b/src/components/ProductTable/FilterInputs/SwitchFilterInput.tsx @@ -3,7 +3,7 @@ import type { IconType } from "react-icons" import { FilterInputState } from "@/lib/types" -import Switch from "@/../tailwind/ui/Switch" +import Switch from "@/components/ui/switch" interface SwitchFilterInputProps { Icon?: IconType diff --git a/src/components/ProductTable/Filters.tsx b/src/components/ProductTable/Filters.tsx index 4dfc33ba1b7..63c38d0441c 100644 --- a/src/components/ProductTable/Filters.tsx +++ b/src/components/ProductTable/Filters.tsx @@ -3,14 +3,13 @@ import { BsArrowCounterclockwise } from "react-icons/bs" import { FilterInputState, FilterOption } from "@/lib/types" -import { Button } from "@/components/ui/buttons/Button" - import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, -} from "@/../tailwind/ui/accordion" +} from "@/components/ui/accordion" +import { Button } from "@/components/ui/buttons/Button" interface PresetFiltersProps { filters: FilterOption[] diff --git a/src/components/StablecoinAccordion/AccordionCustomItem.tsx b/src/components/StablecoinAccordion/AccordionCustomItem.tsx index ff3e479f513..d4d644f0189 100644 --- a/src/components/StablecoinAccordion/AccordionCustomItem.tsx +++ b/src/components/StablecoinAccordion/AccordionCustomItem.tsx @@ -6,12 +6,12 @@ import type { ChildOnlyProp } from "@/lib/types" import { Flex } from "@/components/ui/flex" import { Tag, TagProps } from "@/components/ui/tag" +import Emoji from "../Emoji" import { AccordionContent, AccordionItem, AccordionTrigger, -} from "../../../tailwind/ui/accordion" -import Emoji from "../Emoji" +} from "../ui/accordion" import { accordionButtonContent, CategoryNameType } from "./utils" diff --git a/src/components/StablecoinAccordion/index.tsx b/src/components/StablecoinAccordion/index.tsx index 8c183876e73..2d58e75252f 100644 --- a/src/components/StablecoinAccordion/index.tsx +++ b/src/components/StablecoinAccordion/index.tsx @@ -8,10 +8,10 @@ import { Flex } from "@/components/ui/flex" import InlineLink, { BaseLink } from "@/components/ui/Link" import { LinkBox, LinkOverlay } from "@/components/ui/link-box" -import { Accordion } from "../../../tailwind/ui/accordion" import CardList from "../CardList" import InfoBanner from "../InfoBanner" import Translation from "../Translation" +import { Accordion } from "../ui/accordion" import { AccordionCustomItem, diff --git a/src/components/StablecoinsTable.tsx b/src/components/StablecoinsTable.tsx index 883c7ac477a..7fb2e9299b6 100644 --- a/src/components/StablecoinsTable.tsx +++ b/src/components/StablecoinsTable.tsx @@ -9,7 +9,7 @@ import { TableHead, TableHeader, TableRow, -} from "./ui/Table" +} from "./ui/table" import { useRtlFlip } from "@/hooks/useRtlFlip" diff --git a/src/components/Staking/WithdrawalCredentials.tsx b/src/components/Staking/WithdrawalCredentials.tsx index c3e0a9b7dfa..ae615e0311d 100644 --- a/src/components/Staking/WithdrawalCredentials.tsx +++ b/src/components/Staking/WithdrawalCredentials.tsx @@ -7,10 +7,10 @@ import Translation from "@/components/Translation" import { trackCustomEvent } from "@/lib/utils/matomo" -import Input from "../../../tailwind/ui/Input" import { Alert, AlertContent } from "../ui/alert" import { Button } from "../ui/buttons/Button" import { Flex } from "../ui/flex" +import Input from "../ui/input" import { Spinner } from "../ui/spinner" interface Validator { diff --git a/tailwind/ui/__stories__/Checkbox.stories.tsx b/src/components/ui/__stories__/Checkbox.stories.tsx similarity index 86% rename from tailwind/ui/__stories__/Checkbox.stories.tsx rename to src/components/ui/__stories__/Checkbox.stories.tsx index 24ad47d6bb8..1c94b5f9673 100644 --- a/tailwind/ui/__stories__/Checkbox.stories.tsx +++ b/src/components/ui/__stories__/Checkbox.stories.tsx @@ -1,10 +1,10 @@ import type { Meta, StoryObj } from "@storybook/react/*" -import { HStack, VStack } from "../../../src/components/ui/flex" -import CheckboxComponent, { type CheckboxProps } from "../Checkbox" +import CheckboxComponent, { type CheckboxProps } from "../checkbox" +import { HStack, VStack } from "../flex" const meta = { - title: "Atoms / Form / ShadCN Checkbox", + title: "Atoms / Form / Checkbox", component: CheckboxComponent, } satisfies Meta diff --git a/tailwind/ui/__stories__/Input.stories.tsx b/src/components/ui/__stories__/Input.stories.tsx similarity index 83% rename from tailwind/ui/__stories__/Input.stories.tsx rename to src/components/ui/__stories__/Input.stories.tsx index 2577c2d62b8..33bc92575fb 100644 --- a/tailwind/ui/__stories__/Input.stories.tsx +++ b/src/components/ui/__stories__/Input.stories.tsx @@ -1,10 +1,10 @@ import type { Meta, StoryObj } from "@storybook/react/*" -import { VStack } from "../../../src/components/ui/flex" -import Input from "../Input" +import { VStack } from "../flex" +import Input from "../input" const meta = { - title: "Atoms / Form / ShadCN Input", + title: "Atoms / Form / Input", component: Input, } satisfies Meta diff --git a/tailwind/ui/__stories__/RadioGroup.stories.tsx b/src/components/ui/__stories__/RadioGroup.stories.tsx similarity index 91% rename from tailwind/ui/__stories__/RadioGroup.stories.tsx rename to src/components/ui/__stories__/RadioGroup.stories.tsx index 4229d7c77ff..91813300ec9 100644 --- a/tailwind/ui/__stories__/RadioGroup.stories.tsx +++ b/src/components/ui/__stories__/RadioGroup.stories.tsx @@ -1,14 +1,14 @@ import type { Meta, StoryObj } from "@storybook/react/*" -import { HStack } from "../../../src/components/ui/flex" +import { HStack } from "../flex" import { RadioGroup, RadioGroupItem, type RadioGroupItemProps, -} from "../RadioGroup" +} from "../radio-group" const meta = { - title: "Atoms / Form / ShadCN Radio", + title: "Atoms / Form / Radio", component: RadioGroup, } satisfies Meta diff --git a/tailwind/ui/__stories__/Switch.stories.tsx b/src/components/ui/__stories__/Switch.stories.tsx similarity index 89% rename from tailwind/ui/__stories__/Switch.stories.tsx rename to src/components/ui/__stories__/Switch.stories.tsx index 06885638810..550fbb1f9b6 100644 --- a/tailwind/ui/__stories__/Switch.stories.tsx +++ b/src/components/ui/__stories__/Switch.stories.tsx @@ -1,10 +1,10 @@ import * as React from "react" import { Meta, type StoryObj } from "@storybook/react" -import SwitchComponent from "../Switch" +import SwitchComponent from "../switch" const meta = { - title: "Atoms / Form / ShadCN Switch", + title: "Atoms / Form / Switch", component: SwitchComponent, } satisfies Meta diff --git a/src/components/ui/__stories__/Table/Table.stories.tsx b/src/components/ui/__stories__/Table/Table.stories.tsx index 95017c62737..15480c28fba 100644 --- a/src/components/ui/__stories__/Table/Table.stories.tsx +++ b/src/components/ui/__stories__/Table/Table.stories.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { Flex } from "@chakra-ui/react" import { Meta, StoryObj } from "@storybook/react" -import { Table as TableComponent } from "../../Table" +import { Table as TableComponent } from "../../table" import { MdxDemoData, diff --git a/src/components/ui/__stories__/Table/mockMdxData.tsx b/src/components/ui/__stories__/Table/mockMdxData.tsx index 5346672c7a1..4802cf6e842 100644 --- a/src/components/ui/__stories__/Table/mockMdxData.tsx +++ b/src/components/ui/__stories__/Table/mockMdxData.tsx @@ -8,7 +8,7 @@ import { TableHead, TableHeader, TableRow, -} from "../../Table" +} from "../../table" /* * Note on the Chakra Table components: diff --git a/tailwind/ui/__stories__/accordion.stories.tsx b/src/components/ui/__stories__/accordion.stories.tsx similarity index 100% rename from tailwind/ui/__stories__/accordion.stories.tsx rename to src/components/ui/__stories__/accordion.stories.tsx diff --git a/tailwind/ui/accordion.tsx b/src/components/ui/accordion.tsx similarity index 97% rename from tailwind/ui/accordion.tsx rename to src/components/ui/accordion.tsx index 941c2d227ad..70bdd2b2be5 100644 --- a/tailwind/ui/accordion.tsx +++ b/src/components/ui/accordion.tsx @@ -21,7 +21,7 @@ const AccordionTrigger = React.forwardRef< hideIcon?: boolean } >(({ className, children, hideIcon = false, ...props }, ref) => ( - + >( - ({ className, type, ...props }, ref) => { +const inputVariants = cva( + "rounded border border-body placeholder:text-disabled hover:not-disabled:border-primary-hover focus-visible:outline focus-visible:outline-primary-hover focus-visible:outline-[3px] focus-visible:-outline-offset-2 disabled:cursor-not-allowed disabled:border-disabled bg-background", + { + variants: { + size: { + md: "p-2", + sm: "p-1 text-sm", + }, + }, + defaultVariants: { + size: "md", + }, + } +) + +export interface InputProps + extends Omit, "size">, + VariantProps {} + +const Input = React.forwardRef( + ({ className, type, size, ...props }, ref) => { return ( @@ -19,4 +36,4 @@ const Input = React.forwardRef>( ) Input.displayName = "Input" -export { Input } +export default Input diff --git a/tailwind/ui/RadioGroup.tsx b/src/components/ui/radio-group.tsx similarity index 96% rename from tailwind/ui/RadioGroup.tsx rename to src/components/ui/radio-group.tsx index 33fb48cfd80..bb6a1226fbd 100644 --- a/tailwind/ui/RadioGroup.tsx +++ b/src/components/ui/radio-group.tsx @@ -4,7 +4,7 @@ import * as RadioGroupPrimitive from "@radix-ui/react-radio-group" import { cn } from "@/lib/utils/cn" -import { commonControlClasses } from "./Checkbox" +import { commonControlClasses } from "./checkbox" const RadioGroup = React.forwardRef< React.ElementRef, diff --git a/tailwind/ui/Switch.tsx b/src/components/ui/switch.tsx similarity index 95% rename from tailwind/ui/Switch.tsx rename to src/components/ui/switch.tsx index 5bd5d34168d..abce6ca20f9 100644 --- a/tailwind/ui/Switch.tsx +++ b/src/components/ui/switch.tsx @@ -3,7 +3,7 @@ import * as SwitchPrimitives from "@radix-ui/react-switch" import { cn } from "@/lib/utils/cn" -import { commonControlClasses } from "./Checkbox" +import { commonControlClasses } from "./checkbox" const Switch = React.forwardRef< React.ElementRef, diff --git a/src/components/ui/Table.tsx b/src/components/ui/table.tsx similarity index 100% rename from src/components/ui/Table.tsx rename to src/components/ui/table.tsx diff --git a/src/layouts/Docs.tsx b/src/layouts/Docs.tsx index b599c157fd7..a4e521886b9 100644 --- a/src/layouts/Docs.tsx +++ b/src/layouts/Docs.tsx @@ -30,7 +30,7 @@ import TableOfContents from "@/components/TableOfContents" import Translation from "@/components/Translation" import { Divider } from "@/components/ui/divider" import InlineLink from "@/components/ui/Link" -import { mdxTableComponents } from "@/components/ui/Table" +import { mdxTableComponents } from "@/components/ui/table" import YouTube from "@/components/YouTube" import { cn } from "@/lib/utils/cn" diff --git a/src/layouts/Tutorial.tsx b/src/layouts/Tutorial.tsx index aa052f5e1fe..e888760231e 100644 --- a/src/layouts/Tutorial.tsx +++ b/src/layouts/Tutorial.tsx @@ -24,7 +24,7 @@ import { import TableOfContents from "@/components/TableOfContents" import TooltipLink from "@/components/TooltipLink" import TutorialMetadata from "@/components/TutorialMetadata" -import { mdxTableComponents } from "@/components/ui/Table" +import { mdxTableComponents } from "@/components/ui/table" import YouTube from "@/components/YouTube" import { getEditPath } from "@/lib/utils/editPath" diff --git a/src/pages/gas.tsx b/src/pages/gas.tsx index 2e372181d54..9fd4b89cbd2 100644 --- a/src/pages/gas.tsx +++ b/src/pages/gas.tsx @@ -31,7 +31,7 @@ import { TableHead, TableHeader, TableRow, -} from "@/components/ui/Table" +} from "@/components/ui/table" import { Tag } from "@/components/ui/tag" import { cn } from "@/lib/utils/cn" diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 78e761a7aad..5a8b56b639e 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -80,7 +80,7 @@ import { AccordionContent, AccordionItem, AccordionTrigger, -} from "../../tailwind/ui/accordion" +} from "../components/ui/accordion" import { useClipboard } from "@/hooks/useClipboard" import { fetchCommunityEvents } from "@/lib/api/calendarEvents" diff --git a/src/pages/staking/deposit-contract.tsx b/src/pages/staking/deposit-contract.tsx index 4896802ef02..75fa41d5ee4 100644 --- a/src/pages/staking/deposit-contract.tsx +++ b/src/pages/staking/deposit-contract.tsx @@ -30,6 +30,7 @@ import { type ButtonLinkProps, type ButtonProps, } from "@/components/ui/buttons/Button" +import Checkbox from "@/components/ui/checkbox" import { Flex } from "@/components/ui/flex" import InlineLink from "@/components/ui/Link" @@ -40,8 +41,6 @@ import { getRequiredNamespacesForPage } from "@/lib/utils/translations" import { DEPOSIT_CONTRACT_ADDRESS } from "@/data/addresses" -import Checkbox from "../../../tailwind/ui/Checkbox" - import consensys from "@/public/images/projects/consensys.png" import etherscan from "@/public/images/projects/etherscan-logo-circle.png" import ef from "@/public/images/staking/ef-blog-logo.png" diff --git a/tailwind/ui/Input.tsx b/tailwind/ui/Input.tsx deleted file mode 100644 index 49112e58781..00000000000 --- a/tailwind/ui/Input.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import * as React from "react" -import { cva, type VariantProps } from "class-variance-authority" - -import { cn } from "@/lib/utils/cn" - -const inputVariants = cva( - "rounded border border-body placeholder:text-disabled hover:not-disabled:border-primary-hover focus-visible:outline focus-visible:outline-primary-hover focus-visible:outline-[3px] focus-visible:-outline-offset-2 disabled:cursor-not-allowed disabled:border-disabled bg-background", - { - variants: { - size: { - md: "p-2", - sm: "p-1 text-sm", - }, - }, - defaultVariants: { - size: "md", - }, - } -) - -export interface InputProps - extends Omit, "size">, - VariantProps {} - -const Input = React.forwardRef( - ({ className, type, size, ...props }, ref) => { - return ( - - ) - } -) -Input.displayName = "Input" - -export default Input