Skip to content

Commit 1d54d0e

Browse files
gustn99gustn99
committed
Fix: 컬러시스템 오적용 수정
1 parent 4f11bbf commit 1d54d0e

17 files changed

Lines changed: 30 additions & 39 deletions

File tree

‎src/components/ClothingInfoItem/styles.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const ClothingInfoLeft = styled.div`
3939
4040
.model {
4141
margin-right: auto;
42-
color: ${({ theme }) => theme.colors.black};
42+
color: ${({ theme }) => theme.colors.text.primary};
4343
overflow: hidden;
4444
text-overflow: ellipsis;
4545
display: -webkit-box;

‎src/components/ConfirmationModal/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
2424
>
2525
<ConfirmationModalLayout>
2626
<ContentBox>
27-
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.black}>
27+
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.text.primary}>
2828
{content}
2929
</StyledText>
3030
</ContentBox>
@@ -36,7 +36,7 @@ const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
3636
onCloseModal();
3737
}}
3838
>
39-
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.black}>
39+
<StyledText $textTheme={{ style: 'body2-regular' }} color={theme.colors.text.primary}>
4040
취소
4141
</StyledText>
4242
</Button>

‎src/pages/Account/AccountCancel/index.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import {
2424
CheckboxInput,
2525
Label,
2626
StyledCheckboxText,
27-
StyledDiv,
2827
} from './styles';
2928

3029
const AccountCancel: React.FC = () => {
@@ -85,12 +84,12 @@ const AccountCancel: React.FC = () => {
8584
<CancelContainer>
8685
<TopBar text="회원 탈퇴" LeftButtonSrc={back} onClickLeftButton={() => navigate(-1)} />
8786
<SubTitle>
88-
<StyledText as="div" $textTheme={{ style: 'headline2-medium' }} color={theme.colors.primary}>
87+
<StyledText as="div" $textTheme={{ style: 'headline2-medium' }} color={theme.colors.text.primary}>
8988
OOTD 탈퇴 전 확인하세요!
9089
</StyledText>
9190
</SubTitle>
9291
<Text as="div">
93-
<StyledText as="div" $textTheme={{ style: 'caption1-regular' }} color={theme.colors.primary}>
92+
<StyledText as="div" $textTheme={{ style: 'caption1-regular' }} color={theme.colors.text.primary}>
9493
{`탈퇴하시면 이용 중인 서비스가 폐쇄되며,\n모든 데이터는 복구할 수 없습니다.`}
9594
</StyledText>
9695
</Text>
@@ -99,7 +98,7 @@ const AccountCancel: React.FC = () => {
9998
<StyledText
10099
as="div"
101100
$textTheme={{ style: 'body1-medium' }}
102-
color={theme.colors.primary}
101+
color={theme.colors.text.primary}
103102
style={{ whiteSpace: 'nowrap' }}
104103
>
105104
지금까지 OODD를 이용해주셔서 감사합니다!
@@ -115,9 +114,7 @@ const AccountCancel: React.FC = () => {
115114
</Label>
116115
</CheckboxWrapper>
117116
</CancelContainer>
118-
<StyledDiv isChecked={isChecked}>
119-
<BottomButton content="탈퇴하기" onClick={handleDeleteAccount} disabled={!isChecked} />
120-
</StyledDiv>
117+
<BottomButton content="탈퇴하기" onClick={handleDeleteAccount} disabled={!isChecked} />
121118
{isModalVisible && (
122119
<Modal
123120
content={modalContent || ''}

‎src/pages/Account/AccountCancel/styles.tsx‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ export const CheckboxInput = styled.input`
6464
appearance: none;
6565
width: 1.25rem;
6666
height: 1.25rem;
67-
border: 0.125rem solid ${({ theme }) => theme.colors.gray[200]};
67+
border: 0.125rem solid ${({ theme }) => theme.colors.border.divider};
6868
border-radius: 0.25rem;
6969
position: relative;
7070
&:checked {
71-
background-color: ${({ theme }) => theme.colors.background.primaryLight};
71+
background-color: ${({ theme }) => theme.colors.brand.primaryLight};
7272
border-color: ${({ theme }) => theme.colors.brand.primary};
7373
}
7474
7575
&:checked::after {
7676
content: '✓';
77-
color: ${({ theme }) => theme.colors.contrast};
77+
color: ${({ theme }) => theme.colors.text.contrast};
7878
font-size: 0.875rem;
7979
position: absolute;
8080
top: 50%;
@@ -92,9 +92,3 @@ export const Label = styled.label`
9292
export const StyledCheckboxText = styled(StyledText)`
9393
color: ${({ theme }) => theme.colors.text.caption};
9494
`;
95-
96-
export const StyledDiv = styled.div<{ isChecked: boolean }>`
97-
background-color: ${({ isChecked, theme }) => (isChecked ? theme.colors.primary : theme.colors.gray[300])};
98-
color: ${({ isChecked, theme }) => (isChecked ? theme.colors.contrast : theme.colors.caption)};
99-
cursor: ${({ isChecked }) => (isChecked ? 'pointer' : 'not-allowed')};
100-
`;

‎src/pages/Account/AccountEdit/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const AccountEdit: React.FC = () => {
4141

4242
<Section>
4343
<SectionTitle>
44-
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.primary}>
44+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.primary}>
4545
로그인 정보
4646
</StyledText>
4747
</SectionTitle>
@@ -64,7 +64,7 @@ const AccountEdit: React.FC = () => {
6464
</Section>
6565
<Section>
6666
<SectionTitle>
67-
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.primary}>
67+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.primary}>
6868
회원 정보
6969
</StyledText>
7070
</SectionTitle>

‎src/pages/Account/AccountEdit/styles.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export const Label = styled.div`
8484

8585
export const Info = styled.div`
8686
font-size: 0.875rem;
87-
color: ${({ theme }) => theme.colors.caption};
87+
color: ${({ theme }) => theme.colors.text.caption};
8888
margin-left: 0.625rem;
8989
flex-grow: 1;
9090
text-align: left;

‎src/pages/Account/AccountSetting/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const AccountSetting: React.FC = () => {
8181
</ProfilePic>
8282
<Row>
8383
<Label>
84-
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.primary}>
84+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.primary}>
8585
{userProfile?.nickname}
8686
</StyledText>
8787
</Label>
@@ -98,13 +98,13 @@ const AccountSetting: React.FC = () => {
9898
<List>
9999
<ListItem onClick={handleLogoutClick}>
100100
<img src={leave} alt="로그아웃 아이콘" />
101-
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.primary}>
101+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.primary}>
102102
Logout
103103
</StyledText>
104104
</ListItem>
105105
<ListItem onClick={handleDeleteAccountClick}>
106106
<img src={Profile_s} alt="회원 탈퇴 아이콘" />
107-
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.primary}>
107+
<StyledText $textTheme={{ style: 'body1-medium' }} color={theme.colors.text.primary}>
108108
회원탈퇴
109109
</StyledText>
110110
</ListItem>

‎src/pages/Account/Verification/styles.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const Button = styled.button`
4545
padding: 1.25rem;
4646
margin-top: 300px;
4747
font-size: 0.875rem;
48-
color: ${({ theme }) => theme.colors.contrast};
48+
color: ${({ theme }) => theme.colors.text.contrast};
4949
background-color: ${({ theme, disabled }) => (disabled ? theme.colors.gray[300] : theme.colors.black)};
5050
border: none;
5151
border-radius: 0.3125rem;
@@ -76,7 +76,7 @@ export const Timer = styled.div`
7676
top: 50%;
7777
transform: translateY(-50%);
7878
font-size: 1rem;
79-
color: ${({ theme }) => theme.colors.red || theme.colors.brand.primary};
79+
color: ${({ theme }) => theme.colors.brand.primary};
8080
`;
8181

8282
export const ResendButton = styled.button`
@@ -86,7 +86,7 @@ export const ResendButton = styled.button`
8686
transform: translateY(-50%);
8787
padding: 0.625rem;
8888
font-size: 0.875rem;
89-
color: ${({ theme }) => theme.colors.black};
89+
color: ${({ theme }) => theme.colors.text.primary};
9090
background: none;
9191
border: none;
9292
cursor: pointer;

‎src/pages/NotFound/styles.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ export const StyledButton = styled(StyledText)`
4545
4646
&.prev {
4747
background-color: ${({ theme }) => theme.colors.brand.primary};
48-
color: ${({ theme }) => theme.colors.white};
48+
color: ${({ theme }) => theme.colors.text.contrast};
4949
}
5050
`;

‎src/pages/Post/PostBase/LikeCommentBottomSheetContent/styles.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const InputLayout = styled.div`
114114
width: 50px;
115115
height: 50px;
116116
border-radius: 8px;
117-
color: ${({ theme }) => theme.colors.white};
117+
color: ${({ theme }) => theme.colors.text.contrast};
118118
border: none;
119119
font-size: 0.875rem;
120120
}

0 commit comments

Comments
 (0)