diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index 7745fbb..f7c5ff1 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -1,9 +1,10 @@ import type { Metadata, Viewport } from "next"; +import { GeistMono } from "geist/font/mono"; +import { GeistSans } from "geist/font/sans"; + import { cn } from "@tanya.in/ui"; import { ThemeProvider, ThemeToggle } from "@tanya.in/ui/theme"; import { Toaster } from "@tanya.in/ui/toast"; -import { GeistMono } from "geist/font/mono"; -import { GeistSans } from "geist/font/sans"; import "@/styles/globals.css"; diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts index b5dfe61..53f348e 100644 --- a/apps/web/tailwind.config.ts +++ b/apps/web/tailwind.config.ts @@ -1,7 +1,8 @@ import type { Config } from "tailwindcss"; -import baseConfig from "@tanya.in/tailwind-config/web"; import { fontFamily } from "tailwindcss/defaultTheme"; +import baseConfig from "@tanya.in/tailwind-config/web"; + export default { // We need to append the path to the UI package to the content array so that // those classes are included correctly. diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx index 12f342d..398540f 100644 --- a/packages/ui/src/button.tsx +++ b/packages/ui/src/button.tsx @@ -1,9 +1,10 @@ import type { VariantProps } from "class-variance-authority"; import * as React from "react"; import { Slot } from "@radix-ui/react-slot"; -import { cn } from "@tanya.in/ui"; import { cva } from "class-variance-authority"; +import { cn } from "@tanya.in/ui"; + const buttonVariants = cva( "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50", { diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsx index ced2612..2b5f0c4 100644 --- a/packages/ui/src/dropdown-menu.tsx +++ b/packages/ui/src/dropdown-menu.tsx @@ -7,6 +7,7 @@ import { ChevronRightIcon, DotFilledIcon, } from "@radix-ui/react-icons"; + import { cn } from "@tanya.in/ui"; const DropdownMenu = DropdownMenuPrimitive.Root; diff --git a/packages/ui/src/form.tsx b/packages/ui/src/form.tsx index 77d3b08..a3f3362 100644 --- a/packages/ui/src/form.tsx +++ b/packages/ui/src/form.tsx @@ -11,7 +11,6 @@ import type { ZodType, ZodTypeDef } from "zod"; import * as React from "react"; import { zodResolver } from "@hookform/resolvers/zod"; import { Slot } from "@radix-ui/react-slot"; -import { cn } from "@tanya.in/ui"; import { useForm as __useForm, Controller, @@ -19,6 +18,8 @@ import { useFormContext, } from "react-hook-form"; +import { cn } from "@tanya.in/ui"; + import { Label } from "./label"; const useForm = ( diff --git a/packages/ui/src/input.tsx b/packages/ui/src/input.tsx index 24ab792..34b80cc 100644 --- a/packages/ui/src/input.tsx +++ b/packages/ui/src/input.tsx @@ -1,4 +1,5 @@ import * as React from "react"; + import { cn } from "@tanya.in/ui"; type InputProps = React.InputHTMLAttributes; diff --git a/packages/ui/src/label.tsx b/packages/ui/src/label.tsx index e5025b4..6f81981 100644 --- a/packages/ui/src/label.tsx +++ b/packages/ui/src/label.tsx @@ -1,9 +1,10 @@ import type { VariantProps } from "class-variance-authority"; import * as React from "react"; import * as LabelPrimitive from "@radix-ui/react-label"; -import { cn } from "@tanya.in/ui"; import { cva } from "class-variance-authority"; +import { cn } from "@tanya.in/ui"; + const labelVariants = cva( "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70", ); diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts index fbd1681..4e56403 100644 --- a/packages/ui/tailwind.config.ts +++ b/packages/ui/tailwind.config.ts @@ -3,6 +3,7 @@ * for Tailwind Intellisense & Autocompletion in the source files */ import type { Config } from "tailwindcss"; + import baseConfig from "@tanya.in/tailwind-config/web"; export default {