Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/components/group/GroupCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ const Card = styled.div<{ cardType: 'main' | 'search' | 'modal'; isFirstCard?: b
border: ${({ cardType }) => (cardType === 'main' ? `1px solid ${colors.grey[300]}` : '')};
border-radius: ${({ cardType }) => (cardType === 'search' ? `none` : '12px')};
box-sizing: border-box;
padding: ${({ cardType }) => (cardType === 'search' ? '24px 12px 12px 12px' : '12px')};
padding: ${({ cardType }) => (cardType === 'search' ? '24px 12px' : '12px')};
gap: 12px;
padding: 12px;
min-width: 232px;
cursor: pointer;
`;
Expand Down Expand Up @@ -112,7 +111,7 @@ const Info = styled.div`
flex-direction: column;
justify-content: space-between;
flex: 1;
min-width: 0; /* flex 아이템이 부모 너비를 넘지 않도록 */
min-width: 0;
`;

const Title = styled.h3<{ isRecommend: boolean }>`
Expand All @@ -126,7 +125,7 @@ const Title = styled.h3<{ isRecommend: boolean }>`
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 100%; /* 부모 컨테이너의 전체 너비 사용 */
width: 100%;
`;

const Bottom = styled.div`
Expand Down
12 changes: 8 additions & 4 deletions src/components/search/GroupSearchResult.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const GroupSearchResult = ({
key={group.id}
group={group}
type={'search'}
isOngoing={group.isOnGoing}
isOngoing={false}
isFirstCard={type === 'searching' && idx === 0}
onClick={() => onClickRoom(Number(group.id))}
ref={idx === mapped.length - 1 ? lastRoomElementCallback : undefined}
Expand Down Expand Up @@ -139,11 +139,15 @@ const Tab = styled.button<{ selected?: boolean }>`
const Content = styled.div`
display: flex;
flex-direction: column;
gap: 12px;
overflow-y: auto;
padding: 0 20px 24px;
`;
padding: 0 20px 60px;

&::-webkit-scrollbar {
display: none;
}
-ms-overflow-style: none;
scrollbar-width: none;
`;
const GroupCardHeader = styled.div`
display: flex;
justify-content: space-between;
Expand Down