ONAANDALL/frontend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '9cdf6fb0477cbb7f43794fc9d46b9a60fd7828f7' into iipbs/sn/dev
iipbs_sn / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
JIeunhuh
2025-05-30 14:36:28 +09:00
parent c5fed449a3 9cdf6fb047
commit c6cdcd79da
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/common/components/src/ui/input/index.tsx
+4
View File
@@ -7,7 +7,11 @@ const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
return (
<input
className={cn(
<<<<<<< HEAD
"flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-base text-foreground ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
=======
"flex h-[3.2rem] w-full rounded-md border border-input bg-form px-3 py-2 text-xl ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-placeholder focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-xl",
>>>>>>> 9cdf6fb0477cbb7f43794fc9d46b9a60fd7828f7
className,
)}
ref={ref}