Skip to content

develp branch 작업내용 머지 : develop -> main #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ho0010 merged 3 commits into from
Sep 26, 2025
Merged

develp branch 작업내용 머지 : develop -> main #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3dfc4e
fix: 완료된 모임방 모달 디자인
ho0010 Sep 26, 2025
ff927b7
fix: 내 모임방 모달 디자인
ho0010 Sep 26, 2025
b26c58a
Merge pull request #265 from THIP-TextHip/fix/QA9-3
ho0010 Sep 26, 2025
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
14 changes: 13 additions & 1 deletion src/components/group/CompletedGroupModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ const CompletedGroupModal = ({ onClose }: CompletedGroupModalProps) => {
const [error, setError] = useState<string | null>(null);
const [nickname, setNickname] = useState<string>('');

useEffect(() => {
document.body.style.overflow = 'hidden';
return () => {
document.body.style.overflow = '';
};
}, []);

const convertRoomToGroup = (room: Room): Group => {
return {
id: room.roomId.toString(),
Expand Down Expand Up @@ -126,15 +133,20 @@ const Content = styled.div<{ isEmpty?: boolean }>`
overflow-y: ${({ isEmpty }) => (isEmpty ? 'visible' : 'auto')};
padding: 0 20px;
grid-template-columns: 1fr;
margin-bottom: 70px;

@media (min-width: 584px) {
grid-template-columns: 1fr 1fr;
}

//항목이 하나일 때는 전체 열을 사용하여 2열 그리드처럼 보이지 않도록 처리
& > *:only-child {
grid-column: 1 / -1;
}
&::-webkit-scrollbar {
display: none;
}
-ms-overflow-style: none;
scrollbar-width: none;
`;

const LoadingMessage = styled.div`
Expand Down
1 change: 1 addition & 0 deletions src/components/group/MyGroupModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ const Content = styled.div`
grid-template-columns: 1fr;
scrollbar-width: none;
-ms-overflow-style: none;
margin-bottom: 60px;
&::-webkit-scrollbar {
display: none;
}
Expand Down