登录页面与组件样式调整

src/components/ui/input.tsx

@@ -1,21 +1,27 @@
-import * as React from "react"
+import * as React from 'react'
 
-import { cn } from "@/lib/utils"
+import {merge} from '@/lib/utils'
 
-function Input({ className, type, ...props }: React.ComponentProps<"input">) {
+function Input({className, type, ...props}: React.ComponentProps<'input'>) {
   return (
     <input
       type={type}
       data-slot="input"
-      className={cn(
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-        "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",
-        className
+      className={merge(
+        `transition-[color,box-shadow] duration-200 ease-in-out`,
+        `h-10 min-w-0 w-full`,
+        ' placeholder:text-muted-foreground',
+        'selection:bg-primary selection:text-primary-foreground',
+        'flex rounded-md border bg-transparent px-3 py-1 text-base shadow-xs',
+        'outline-none focus-visible:ring-4 ring-blue-200',
+        'disabled:cursor-not-allowed disabled:opacity-50',
+        'aria-invalid:ring-destructive/20 aria-invalid:border-destructive dark:aria-invalid:ring-destructive/40 dark:bg-input/30',
+        'file:text-foreground file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:disabled:pointer-events-none',
+        className,
       )}
       {...props}
     />
   )
 }
 
-export { Input }
+export {Input}