登录页面与组件样式调整

src/lib/utils.ts

@@ -1,6 +1,6 @@
-import { clsx, type ClassValue } from "clsx"
-import { twMerge } from "tailwind-merge"
+import {ClassNameValue, twMerge} from 'tailwind-merge'
 
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+export function merge(...inputs: ClassNameValue[]) {
+  return twMerge(inputs)
 }
+