diff --git a/src/lib/utils.ts b/src/lib/utils.ts index b4b4fa2..9ad0df4 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,5 +1,6 @@ import { type ClassValue, clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; export function cn(...inputs: ClassValue[]) { - return clsx(inputs); + return twMerge(clsx(inputs)); } diff --git a/src/pages/Timestamp/components/ConverterForm.tsx b/src/pages/Timestamp/components/ConverterForm.tsx index 715574a..77f5f1c 100644 --- a/src/pages/Timestamp/components/ConverterForm.tsx +++ b/src/pages/Timestamp/components/ConverterForm.tsx @@ -41,10 +41,7 @@ export default function ConverterForm({ placeholder={INPUT_PLACEHOLDERS[mode]} value={input} onChange={(e) => setInput(e.target.value)} - className={cn( - 'font-mono font-semibold h-10 shadow-sm placeholder:text-muted-foreground/60 focus:bg-background', - error && 'border-destructive focus-visible:ring-destructive', - )} + className={cn('h-10', error && 'border-destructive')} /> {error &&

{error}

} @@ -60,16 +57,13 @@ export default function ConverterForm({ />