Skip to content

Commit 317278e

Browse files
authored
Merge branch 'epicweb-dev:main' into pr/persist-roles-and-permissions-between-tests
2 parents 76648c1 + 9db9a75 commit 317278e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

app/components/ui/input-otp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const InputOTPSlot = React.forwardRef<
4040
<div
4141
ref={ref}
4242
className={cn(
43-
'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md',
43+
'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-base md:text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md',
4444
isActive && 'z-10 ring-2 ring-ring ring-offset-background',
4545
className,
4646
)}

app/components/ui/input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
1111
<input
1212
type={type}
1313
className={cn(
14-
'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
14+
'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background file:border-0 file:bg-transparent file:text-base md:file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
1515
className,
1616
)}
1717
ref={ref}

app/components/ui/textarea.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
1010
return (
1111
<textarea
1212
className={cn(
13-
'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
13+
'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
1414
className,
1515
)}
1616
ref={ref}

app/entry.server.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export function handleError(
110110
true,
111111
)
112112
} else {
113-
console.error(chalk.red(error))
113+
console.error(error)
114114
Sentry.captureException(error)
115115
}
116116
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"sideEffects": false,
55
"license": "MIT",
66
"epic-stack": {
7-
"head": "2e549034fa693d745a2624b61e6b4febba684b39",
8-
"date": "2024-09-14T13:08:21Z"
7+
"head": "1f76cd816c07c9bc0ab73bd339a02c98ff34f7ae",
8+
"date": "2024-09-17T22:17:16Z"
99
},
1010
"author": "Kent C. Dodds <[email protected]> (https://kentcdodds.com/)",
1111
"type": "module",

0 commit comments

Comments
 (0)