Skip to content
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

fix: 다짐 메시지 모달 칩 스타일 변경 #1574

Merged
merged 4 commits into from
Sep 27, 2024
Merged

fix: 다짐 메시지 모달 칩 스타일 변경 #1574

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
418a8d2
fix: 칩 영역 모바일/데스크탑 레이아웃이 유지되도록 스타일 수정
simeunseo Sep 27, 2024
4dfd9de
fix: 목표 에러 메시지에 padding-left 추가
simeunseo Sep 27, 2024
11b5269
fix: 목표 에러 메시지 height 조정
simeunseo Sep 27, 2024
b81c9cb
fix: 테스트용으로 isRegistration을 반전시켜놓은 것을 되돌림
simeunseo Sep 27, 2024
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
34 changes: 23 additions & 11 deletions src/components/resolution/submit/ResolutionSubmitModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,12 @@ const ResolutionSubmitModal: FC<ResolutionSubmitModalProps> = ({ profileImageUrl
onClick={() => onClickTag(tag.value)}
isSelected={selectedTag.includes(tag.value)}
>
<Text typography='SUIT_14_SB' color={selectedTag.includes(tag.value) ? colors.white : colors.gray200}>
{tag.icon} {tag.value}
</Text>
<StyledTagText
typography='SUIT_16_SB'
color={selectedTag.includes(tag.value) ? colors.white : colors.gray200}
>
{tag.icon + tag.value}
</StyledTagText>
</StyledTagItem>
</div>
))}
Expand Down Expand Up @@ -181,7 +184,7 @@ const StyledForm = styled.form`
display: flex;
flex-direction: column;
align-items: center;
padding: 0 20px;
padding: 0;
width: 426px;
overflow-y: scroll;

Expand Down Expand Up @@ -226,10 +229,22 @@ const StyledTags = styled.section`
flex-wrap: wrap;
row-gap: 12px;
column-gap: 10px;
justify-content: center;
justify-content: space-between;
justify-items: center;
margin-top: 12px;
padding: 0 20px;
line-height: 22px;

@media ${MOBILE_MEDIA_QUERY} {
column-gap: 0;
padding: 0 18.5px;
}
`;

const StyledTagText = styled(Text)`
@media ${MOBILE_MEDIA_QUERY} {
font-size: 14px;
}
`;

const StyledTagItem = styled.label<{ isSelected: boolean }>`
Expand All @@ -242,7 +257,7 @@ const StyledTagItem = styled.label<{ isSelected: boolean }>`
border-radius: 20px;
background-color: ${colors.gray800};
cursor: pointer;
padding: 6px 16px 6px 10px;
padding: 6px 14px;
width: max-content;
`;

Expand Down Expand Up @@ -286,16 +301,13 @@ const TagTextWrapper = styled.div`
const TagErrorWrapper = styled.div`
display: flex;
align-items: center;
padding-left: 20px;
width: 100%;
height: 40px;
height: 32px;

& > svg {
margin-right: 6px;
}

@media ${MOBILE_MEDIA_QUERY} {
padding-left: 20px;
}
`;

const TagErrorMessage = styled(Text)`
Expand Down
Loading