diff --git a/packages/ui/src/components/button/index.ts b/packages/ui/src/components/button/index.ts index 3ee6d55e..a1f61a71 100644 --- a/packages/ui/src/components/button/index.ts +++ b/packages/ui/src/components/button/index.ts @@ -4,14 +4,13 @@ import { cva } from 'class-variance-authority' export { default as Button } from './Button.vue' export const buttonVariants = cva( - 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2', + "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 cursor-pointer", { variants: { variant: { default: 'bg-primary text-primary-foreground shadow hover:bg-primary/90', - destructive: - 'bg-destructive text-white shadow hover:bg-destructive/90', + destructive: 'bg-destructive text-white shadow hover:bg-destructive/90', outline: 'border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 shadow-sm hover:bg-gray-50 dark:hover:bg-gray-700', secondary: @@ -21,10 +20,10 @@ export const buttonVariants = cva( link: 'text-primary underline-offset-4 hover:underline', }, size: { - 'default': 'h-9 px-4 py-2 has-[>svg]:px-3', - 'sm': 'h-8 rounded-lg gap-1.5 px-3 has-[>svg]:px-2.5', - 'lg': 'h-10 rounded-lg px-6 has-[>svg]:px-4', - 'icon': 'size-9', + default: 'h-9 px-4 py-2 has-[>svg]:px-3', + sm: 'h-8 rounded-lg gap-1.5 px-3 has-[>svg]:px-2.5', + lg: 'h-10 rounded-lg px-6 has-[>svg]:px-4', + icon: 'size-9', 'icon-sm': 'size-8', 'icon-lg': 'size-10', }, diff --git a/packages/ui/src/components/sidebar/index.ts b/packages/ui/src/components/sidebar/index.ts index 48da2742..844557d9 100644 --- a/packages/ui/src/components/sidebar/index.ts +++ b/packages/ui/src/components/sidebar/index.ts @@ -36,7 +36,7 @@ export { default as SidebarTrigger } from './SidebarTrigger.vue' export { useSidebar } from './utils' export const sidebarMenuButtonVariants = cva( - 'peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0', + 'peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 cursor-pointer', { variants: { variant: { @@ -57,4 +57,6 @@ export const sidebarMenuButtonVariants = cva( }, ) -export type SidebarMenuButtonVariants = VariantProps +export type SidebarMenuButtonVariants = VariantProps< + typeof sidebarMenuButtonVariants +>