Merge pull request #137 from jeiltodo/develop

Develop
jeiltodo · Aug 28, 2024 · 0366881 · 0366881
2 parents 3be2f8b + 37905b6
commit 0366881
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/user/src/entities/group/ui/group-progress-bar.tsx b/apps/user/src/entities/group/ui/group-progress-bar.tsx
@@ -34,7 +34,7 @@ export const GroupProgressBar = ({ progress, className }: Props) => {
  onMouseLeave={() => setHoveredMember(null)}
  >
  {hoveredMember === member.nickname && (
- <div className='absolute left-1/2 top-2 transform -translate-x-1/2 text-slate-600 bg-white border border-slate-100 text-sm font-noraml rounded-[5px] px-3 py-2'>
+ <div className='absolute left-1/2 top-2 transform -translate-x-1/2 text-slate-600 bg-white border border-slate-100 text-sm whitespace-nowrap font-pretendard-regular rounded-[5px] px-3 py-2'>
  {member.nickname}
  </div>
  )}

diff --git a/packages/ui/src/entities/group/ui/group-overview-board.tsx b/packages/ui/src/entities/group/ui/group-overview-board.tsx
@@ -64,7 +64,7 @@ export const GroupOverviewBoard = ({
  return (
  <BoardLayout
  title='그룹 정보'
- className={isAdmin ? 'w-[400px]' : 'tablet:min-w-[300px]'}
+ className={isAdmin ? 'w-[450px]' : 'tablet:min-w-[300px]'}
  isAdmin={isAdmin}
  >
  <div

diff --git a/packages/ui/src/widgets/group/ui/members-board.tsx b/packages/ui/src/widgets/group/ui/members-board.tsx
@@ -61,7 +61,7 @@ export const MembersBoard = ({
 
  return (
  <div
- className={`relative px-6 py-4 rounded-lg ${isAdmin ? 'w-[504px] bg-blue-500' : 'bg-orange-500'} overflow-hidden`}
+ className={`relative px-6 py-4 rounded-lg mobile:w-full desktop:max-w-[734px] ${isAdmin ? 'w-[504px] bg-blue-500' : 'bg-orange-500'} overflow-hidden`}
  >
  <div className='w-full h-full'>
  <div className='flex flex-row justify-between items-center mb-6 tablet:flex-row gap-y-3'>