Skip to content

Commit 956043d

Browse files
authored
Merge branch 'main' into develop
2 parents 815f309 + 5f74aca commit 956043d

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/components/atoms/Button/button.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ const buttonVariants = cva(
6060
)
6161

6262
export interface ButtonProps
63-
extends
64-
React.ButtonHTMLAttributes<HTMLButtonElement>,
63+
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
6564
VariantProps<typeof buttonVariants> {
6665
asChild?: boolean
6766
}

src/components/molecules/card/Card.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ export function CardTitle({
287287
)
288288
}
289289

290-
export interface CardBookmarkProps extends React.HTMLAttributes<HTMLButtonElement> {
290+
export interface CardBookmarkProps
291+
extends React.HTMLAttributes<HTMLButtonElement> {
291292
isSubscribed?: boolean
292293
onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void
293294
className?: string

src/components/molecules/card/MobileCard.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import {
1010
} from '@/assets/icons'
1111
import { cn } from '@/shared/utils/cn'
1212

13-
//TODO: 디자인 토큰 추가
14-
1513
export interface MobileCardProps extends React.HTMLAttributes<HTMLDivElement> {
1614
logoUrl?: string | null
1715
fallbackSrc?: string | null

0 commit comments

Comments
 (0)