Skip to content

Commit 2b82e17

Browse files
authored
fix: 2차 QA 반영 (#2046)
* fix: 2차 QA 반영 * chore: 메세지 모달 갭 0으로 수정 * fix: 태그 기존 코드에 맞게 span 사용 * fix: 모달 x 버튼 breakpoint 통일 * fix: 코드리뷰 반영
1 parent d0d511c commit 2b82e17

File tree

3 files changed

+35
-23
lines changed

3 files changed

+35
-23
lines changed

src/components/feed/detail/DetailFeedCard.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ const Header = ({
9191
<StyledHeader align='center' justify='space-between' as='header'>
9292
<Flex.Center css={{ gap: 8 }}>
9393
{!isIOSApp && <div css={{ width: '24px', height: '24px' }}>{left}</div>}
94-
{navigator.userAgent}
9594
{renderCategoryLink({
9695
children: (
9796
<Chip align='center' as='div'>

src/components/members/detail/MessageSection/MessageModal.tsx

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import IconNetwork from '@/public/icons/icon-network.svg';
1919
import IconAppjam from '@/public/icons/icon-appjam-build.svg';
2020
import IconProject from '@/public/icons/icon-project-suggest.svg';
2121
import IconEtc from '@/public/icons/icon-postnote-etc.svg';
22+
import { fonts } from '@sopt-makers/fonts';
2223

2324
export enum MessageCategory {
2425
NETWORK = '친목',
@@ -155,12 +156,12 @@ const MessageModal: FC<MessageModalProps> = ({
155156
<StyledIconPlane>
156157
<IconPlane />
157158
</StyledIconPlane>
158-
<Text mt={24} typography='SUIT_24_B'>
159+
<StyledText mb={fonts.HEADING_20_B} pc={fonts.HEADING_24_B}>
159160
{name}님에게 쪽지 보내기
160-
</Text>
161-
<Text mt={14} typography='SUIT_14_M' color={colors.gray300}>
161+
</StyledText>
162+
<StyledText mb={fonts.BODY_13_M} pc={fonts.BODY_14_M} color={colors.gray300}>
162163
작성하신 내용은 회원님의 프로필과 함께 문자로 전달돼요
163-
</Text>
164+
</StyledText>
164165
<StyledCategory>
165166
{CATEGORY.map((category, index) => (
166167
<StyledCategoryItem
@@ -169,7 +170,7 @@ const MessageModal: FC<MessageModalProps> = ({
169170
isSelected={category.value === (selectedCategory as MessageCategory | null)}
170171
>
171172
<category.icon />
172-
<Text typography='SUIT_15_SB'>{category.value}</Text>
173+
<span>{category.value}</span>
173174
</StyledCategoryItem>
174175
))}
175176
</StyledCategory>
@@ -203,14 +204,8 @@ const MessageModal: FC<MessageModalProps> = ({
203204
defaultValue=''
204205
disableEnterSubmit
205206
/>
206-
<StyledButton type='submit' disabled={!isValid || isPending}>
207-
{isPending ? (
208-
<Loading color='white' />
209-
) : (
210-
<Text typography='SUIT_15_SB' color={isValid ? colors.gray950 : colors.gray400}>
211-
쪽지 보내기
212-
</Text>
213-
)}
207+
<StyledButton size='md' type='submit' disabled={!isValid || isPending}>
208+
{isPending ? <Loading color='white' /> : '쪽지 보내기'}
214209
</StyledButton>
215210
</StyledForm>
216211
{ConfirmComponent}
@@ -245,6 +240,7 @@ const StyledIconPlane = styled.div`
245240
display: flex;
246241
align-items: center;
247242
justify-content: center;
243+
margin-bottom: 16px;
248244
border-radius: 15.75px;
249245
background: ${colors.blue50};
250246
width: 54px;
@@ -255,6 +251,7 @@ const StyledIconPlane = styled.div`
255251
}
256252
257253
@media ${MB_BIG_MEDIA_QUERY} {
254+
margin-bottom: 12px;
258255
border-radius: 14px;
259256
width: 44px;
260257
height: 44px;
@@ -265,22 +262,38 @@ const StyledIconPlane = styled.div`
265262
}
266263
`;
267264

265+
const StyledText = styled(Text)<{ mb: string; pc: string }>`
266+
${({ pc }) =>
267+
pc &&
268+
`
269+
${pc}
270+
`}
271+
272+
@media ${MB_BIG_MEDIA_QUERY} {
273+
${({ mb }) =>
274+
mb &&
275+
`${mb}
276+
`}
277+
}
278+
`;
279+
268280
const StyledCategory = styled.section`
269281
display: flex;
270282
flex-wrap: wrap;
271283
row-gap: 12px;
272-
column-gap: 12px;
284+
column-gap: 10px;
273285
align-items: center;
274286
justify-content: center;
275287
margin: 32px 0 44px;
276-
width: 225px;
288+
width: 230px;
277289
278290
@media ${MB_BIG_MEDIA_QUERY} {
279-
margin: 24px 0 32px;
291+
margin: 24px 0 36px;
280292
}
281293
`;
282294

283295
const StyledCategoryItem = styled.div<{ isSelected: boolean }>`
296+
box-sizing: border-box;
284297
display: flex;
285298
gap: 4px;
286299
align-items: center;
@@ -291,6 +304,7 @@ const StyledCategoryItem = styled.div<{ isSelected: boolean }>`
291304
background-color: ${colors.gray800};
292305
cursor: pointer;
293306
padding: 6px 16px 6px 10px;
307+
${fonts.LABEL_16_SB}
294308
295309
& span {
296310
color: ${({ isSelected }) => (isSelected ? colors.gray10 : colors.gray400)};
@@ -332,5 +346,5 @@ const TextLength = styled.span`
332346
`;
333347

334348
const StyledButton = styled(Button)`
335-
margin-top: 40px;
349+
margin-top: 16px;
336350
`;

src/components/members/detail/MessageSection/Modal.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useEscapeCallback } from '@/hooks/useEscapeCallback';
1010
import useOnClickOutside from '@/hooks/useOnClickOutside';
1111
import IconModalCheck from '@/public/icons/icon-modal-check.svg';
1212
import IconModalClose from '@/public/icons/icon-modal-close.svg';
13-
import { MB_BIG_MEDIA_QUERY, MB_MID_MEDIA_QUERY, MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery';
13+
import { MB_BIG_MEDIA_QUERY } from '@/styles/mediaQuery';
1414
import { textStyles } from '@/styles/typography';
1515

1616
/**
@@ -82,7 +82,6 @@ const StyledModal = styled.div<{ width?: number }>`
8282
display: flex;
8383
position: relative;
8484
flex-direction: column;
85-
gap: 16px;
8685
z-index: 101;
8786
border-radius: 22.94px;
8887
background: ${colors.gray800};
@@ -99,7 +98,7 @@ const StyledCloseButton = styled.button`
9998
padding-right: 32px;
10099
color: ${colors.white};
101100
102-
@media ${MB_MID_MEDIA_QUERY} {
101+
@media ${MB_BIG_MEDIA_QUERY} {
103102
padding-top: 24px;
104103
padding-right: 24px;
105104
}
@@ -119,10 +118,10 @@ const ModalContent = styled.div`
119118
flex-direction: column;
120119
align-items: center;
121120
justify-content: center;
122-
padding: 0 32px 40px;
121+
padding: 0 32px 32px;
123122
124123
@media ${MB_BIG_MEDIA_QUERY} {
125-
padding: 0 24px 32px;
124+
padding: 0 24px 24px;
126125
}
127126
`;
128127

0 commit comments

Comments
 (0)