登录页面与组件样式调整

src/components/ui/button.tsx

@@ -1,64 +1,35 @@
-import * as React from "react"
-import { Slot } from "@radix-ui/react-slot"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from 'react'
+import {Slot} from '@radix-ui/react-slot'
+import {merge} from '@/lib/utils'
 
-import { cn } from "@/lib/utils"
+type ButtonProps = React.ComponentProps<'button'> & {
+  variant?: 'default' | 'outline' | 'gradient'
+}
 
-const buttonVariants = cva(
-  "inline-flex items-center justify-center gap-2 " +
-  "whitespace-nowrap rounded-md text-sm 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:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] " +
-  "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
-  {
-    variants: {
-      variant: {
-        default:
-          "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
-        destructive:
-          "bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
-        outline:
-          "border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
-        secondary:
-          "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
-        ghost:
-          "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
-        link: "text-primary underline-offset-4 hover:underline",
-      },
-      size: {
-        default: "h-9 px-4 py-2 has-[>svg]:px-3",
-        sm: "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
-        lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
-        icon: "size-9",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-      size: "default",
-    },
-  }
-)
-
-function Button({
-  className,
-  variant,
-  size,
-  asChild = false,
-  ...props
-}: React.ComponentProps<"button"> &
-  VariantProps<typeof buttonVariants> & {
-    asChild?: boolean
-  }) {
-  const Comp = asChild ? Slot : "button"
+function Button(rawProps: ButtonProps) {
+  const {className, variant, ...props} = rawProps
 
   return (
-    <Comp
-      data-slot="button"
-      className={cn(buttonVariants({ variant, size, className }))}
+    <button
+      className={merge(
+        `transition-all duration-200 ease-in-out`,
+        `h-10 px-4 rounded-md cursor-pointer`,
+        'whitespace-nowrap',
+        'inline-flex items-center justify-center gap-2',
+        '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-4 ring-blue-200',
+        'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
+        {
+          gradient: 'bg-gradient-to-r from-blue-400 to-cyan-300 text-white ring-offset-2',
+          default: 'bg-primary text-primary-foreground shadow-xs hover:bg-primary/90',
+          outline: 'border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
+        }[variant ?? 'default'],
+        className,
+      )}
       {...props}
     />
   )
 }
 
-export { Button, buttonVariants }
+export {Button}