lanhu/web
2
0
Fork 0
Code Issues Actions Packages Releases 16 Activity

完成个人中心页面功能，公共组件部分调整

Browse Source
This commit is contained in:
luorijun
2025-04-29 18:47:36 +08:00
parent ec7eb7093f
commit 09d6255bd5
13 changed files with 531 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/ui/button.tsx
View File

@@ -3,33 +3,33 @@ import {merge} from '@/lib/utils'
import {cva} from 'class-variance-authority'
const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 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 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
'inline-flex items-center justify-center gap-2 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 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
{
variants: {
variant: {
default:
"bg-primary text-primary-foreground shadow hover:bg-primary/90",
'bg-primary text-primary-foreground shadow hover:bg-primary/90',
destructive:
"bg-fail text-fail-foreground shadow-sm hover:bg-destructive/90",
'bg-fail text-fail-foreground shadow-sm hover:bg-destructive/90',
outline:
"border border-input shadow-sm hover:bg-secondary hover:text-secondary-foreground bg-card",
'border border-input shadow-sm hover:bg-secondary hover:text-secondary-foreground bg-card',
secondary:
"bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
ghost: "hover:bg-secondary hover:text-secondary-foreground",
link: "text-primary underline-offset-4 hover:underline",
'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
ghost: 'hover:bg-secondary hover:text-secondary-foreground',
link: 'text-primary underline-offset-4 hover:underline',
},
size: {
default: "h-9 px-4 py-2",
sm: "h-8 rounded-md px-3 text-xs",
lg: "h-10 rounded-md px-8",
icon: "h-9 w-9",
default: 'h-9 px-4 py-2',
sm: 'h-8 rounded-md px-3 text-xs',
lg: 'h-10 rounded-md px-8',
icon: 'h-9 w-9',
},
},
defaultVariants: {
variant: "default",
size: "default",
variant: 'default',
size: 'default',
},
}
},
)
type ButtonProps = React.ComponentProps<'button'> & {
@@ -40,6 +40,7 @@ function Button(rawProps: ButtonProps) {
const {className, theme, ...props} = rawProps
return (
<button
{...props}
className={merge(
`transition-all duration-200 ease-in-out`,
`h-10 px-4 rounded-md cursor-pointer`,
@@ -55,11 +56,10 @@ function Button(rawProps: ButtonProps) {
accent: 'bg-accent text-accent-foreground hover:bg-accent/90',
error: 'bg-fail text-white hover:bg-fail/90',
outline: 'border bg-background hover:bg-secondary hover:text-secondary-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
ghost: "text-foreground hover:bg-muted",
ghost: 'text-foreground hover:bg-muted',
}[theme ?? 'default'],
className,
)}
{...props}
/>
)
}