Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
Browse files Browse the repository at this point in the history
… dev
  • Loading branch information
LeHiHo committed Jan 26, 2024
2 parents 7ed23e0 + 600c7cd commit fb66271
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions src/components/Trip/LikedToursLists/LikedToursListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const LikedToursListItem: React.FC<LikedToursListItemProps> = ({

return (
<div
className={`relative mb-[4px] cursor-pointer`}
className={`relative mb-[6px] flex max-h-[72px] cursor-pointer`}
onClick={() => navigate(`/detail/${tourItemId}`)}>
<div className="flex">
<div>
Expand All @@ -83,13 +83,13 @@ const LikedToursListItem: React.FC<LikedToursListItemProps> = ({
/>
</div>

<div className="ml-[8px] flex flex-col items-start justify-between gap-[1px]">
<div className="max-w-[270px]">
<p className="truncate whitespace-nowrap px-[2px] text-[16px] font-bold leading-normal text-black">
<div className="ml-[8px] flex max-h-[72px] flex-col items-start">
<div className="mt-[-5px] flex max-w-[230px] flex-col">
<p className="truncate whitespace-nowrap text-[16px] font-bold leading-normal text-black ">
{title}
</p>

<div className="flex items-center">
<div className="mb-[8.5px] mt-[-4px] flex items-center">
<div className="mr-[5px] flex items-center">
<div>
<StarIcon size={12.5} color="#FFEC3E" fill="#FFEC3E" />
Expand Down
14 changes: 7 additions & 7 deletions src/components/Wish/WishItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ const WishItem: React.FC<WishItemProps> = ({ wishList }) => {

return (
<div
className={`relative mb-[2px] cursor-pointer `}
className={`relative mb-[6px] flex max-h-[72px] cursor-pointer items-center`}
onClick={() => navigate(`/detail/${id}`)}>
<div className="flex">
<div className="flex items-center">
<div>
<img
className="rounded-1 h-[72px] max-h-[72px] w-[72px] rounded-[8px] object-cover"
Expand All @@ -51,7 +51,7 @@ const WishItem: React.FC<WishItemProps> = ({ wishList }) => {
<p className=" truncate whitespace-nowrap px-[2px] text-[16px] font-bold leading-normal text-black">
{title}
</p>
<div className="ml-[3px] mt-[5px] max-w-[260px]">
<div className="ml-[3px] max-w-[260px]">
<p className="truncate text-[14px] text-gray6">
{isMetroIncluded && tourAddress
? (tourAddress.match(/(.*?[시군구])/)?.[0] || '') +
Expand All @@ -63,9 +63,9 @@ const WishItem: React.FC<WishItemProps> = ({ wishList }) => {
</div>
</div>

<div className="caption1 mb-[2px] ml-[3px] flex justify-center leading-normal text-gray4">
<div className="caption1 mb-[4px] ml-[3px] flex justify-center leading-normal text-gray4">
<div className="mr-[5px] flex items-center">
<div className="mb-[2px]">
<div className="">
<StarIcon size={12.5} color="#FFEC3E" fill="#FFEC3E" />
</div>
<div className="flex items-center pt-[1.5px]">
Expand All @@ -78,10 +78,10 @@ const WishItem: React.FC<WishItemProps> = ({ wishList }) => {
</div>
</div>
<div className="flex items-center justify-center ">
<div className="mb-[0.5px]">
<div className="">
<HeartIcon size={14} color="#FF2167" fill="#FF2167" />
</div>
<span className="ml-1 mt-[2.8px] text-xs">
<span className="ml-1 mt-[0px] text-xs">
{likedCount ? likedCount.toLocaleString() : likedCount}
</span>
</div>
Expand Down

0 comments on commit fb66271

Please sign in to comment.