Skip to content

Commit 1d2a8a6

Browse files
committed
Merge remote-tracking branch 'origin/dev' into style/scroll#82
2 parents e5258c3 + 431ef3a commit 1d2a8a6

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/app/recipe/page.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function Page() {
3535
<p>n개</p>
3636
<SelectBox option={['', '댓글순', '인기순']} title="최신순" />
3737
</div>
38-
3938
<section className="mt-5 ">
4039
<CocktailList />
4140
</section>

src/domains/recipe/CocktailCard.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface Props {
1717

1818
function CocktailCard({ src, name, nameKo, keep = true, className, textSize1, textSize2 }: Props) {
1919
return (
20-
<li className="flex flex-col gap-4">
20+
<div className="flex flex-col gap-4">
2121
<div
2222
className={tw(
2323
`${!className && 'w-80 h-75 md:w-62.5 '} rounded-xl overflow-hidden relative`,
@@ -27,7 +27,10 @@ function CocktailCard({ src, name, nameKo, keep = true, className, textSize1, te
2727
{/* <Image src={src} alt={name} fill /> */}
2828
<Image src={Img} alt="" fill className="object-cover " />
2929
{keep && (
30-
<div className="flex justify-between absolute left-0 top-0">
30+
<div className="flex w-full px-2 items-center justify-between absolute left-0 top-0">
31+
<div>
32+
<Label title="레시피" />
33+
</div>
3134
<Keep />
3235
</div>
3336
)}
@@ -36,7 +39,7 @@ function CocktailCard({ src, name, nameKo, keep = true, className, textSize1, te
3639
<h3 className={tw(`${!textSize1 && 'text-2xl'}`, textSize1)}>Old Fassioned</h3>
3740
<p className={tw(`${!textSize2 && 'text-base'}`, textSize2)}>올드 패션드</p>
3841
</div>
39-
</li>
42+
</div>
4043
);
4144
}
4245
export default CocktailCard;

0 commit comments

Comments
 (0)