|
|
@@ -224,7 +224,7 @@ const Sidebar = React.forwardRef<
|
|
|
return (
|
|
|
<div
|
|
|
ref={ref}
|
|
|
- className='group peer hidden md:block text-sidebar-foreground'
|
|
|
+ className='group peer hidden text-sidebar-foreground md:block'
|
|
|
data-state={state}
|
|
|
data-collapsible={state === 'collapsed' ? collapsible : ''}
|
|
|
data-variant={variant}
|
|
|
@@ -233,7 +233,7 @@ const Sidebar = React.forwardRef<
|
|
|
{/* This is what handles the sidebar gap on desktop */}
|
|
|
<div
|
|
|
className={cn(
|
|
|
- 'duration-200 relative h-svh w-[--sidebar-width] bg-transparent transition-[width] ease-linear',
|
|
|
+ 'relative h-svh w-[--sidebar-width] bg-transparent transition-[width] duration-200 ease-linear',
|
|
|
'group-data-[collapsible=offcanvas]:w-0',
|
|
|
'group-data-[side=right]:rotate-180',
|
|
|
variant === 'floating' || variant === 'inset'
|
|
|
@@ -243,7 +243,7 @@ const Sidebar = React.forwardRef<
|
|
|
/>
|
|
|
<div
|
|
|
className={cn(
|
|
|
- 'duration-200 fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex',
|
|
|
+ 'fixed inset-y-0 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] duration-200 ease-linear md:flex',
|
|
|
side === 'left'
|
|
|
? 'left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]'
|
|
|
: 'right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]',
|
|
|
@@ -448,7 +448,7 @@ const SidebarGroupLabel = React.forwardRef<
|
|
|
ref={ref}
|
|
|
data-sidebar='group-label'
|
|
|
className={cn(
|
|
|
- 'duration-200 flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-none ring-sidebar-ring transition-[margin,opa] ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',
|
|
|
+ 'flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium text-sidebar-foreground/70 outline-none ring-sidebar-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0',
|
|
|
'group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0',
|
|
|
className
|
|
|
)}
|
|
|
@@ -640,7 +640,7 @@ const SidebarMenuBadge = React.forwardRef<
|
|
|
ref={ref}
|
|
|
data-sidebar='menu-badge'
|
|
|
className={cn(
|
|
|
- 'absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground select-none pointer-events-none',
|
|
|
+ 'pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-sidebar-foreground',
|
|
|
'peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground',
|
|
|
'peer-data-[size=sm]/menu-button:top-1',
|
|
|
'peer-data-[size=default]/menu-button:top-1.5',
|
|
|
@@ -668,7 +668,7 @@ const SidebarMenuSkeleton = React.forwardRef<
|
|
|
<div
|
|
|
ref={ref}
|
|
|
data-sidebar='menu-skeleton'
|
|
|
- className={cn('rounded-md h-8 flex gap-2 px-2 items-center', className)}
|
|
|
+ className={cn('flex h-8 items-center gap-2 rounded-md px-2', className)}
|
|
|
{...props}
|
|
|
>
|
|
|
{showIcon && (
|
|
|
@@ -678,7 +678,7 @@ const SidebarMenuSkeleton = React.forwardRef<
|
|
|
/>
|
|
|
)}
|
|
|
<Skeleton
|
|
|
- className='h-4 flex-1 max-w-[--skeleton-width]'
|
|
|
+ className='h-4 max-w-[--skeleton-width] flex-1'
|
|
|
data-sidebar='menu-skeleton-text'
|
|
|
style={
|
|
|
{
|