Skip to content

Commit 31444c9

Browse files
committed
Refact: 이용약관 동의 페이지에 컬러시스템 적용
1 parent 7b8057f commit 31444c9

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/components/UserProfile/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const UserProfile: React.FC<UserProfileProps> = React.memo(({ userImg, bio = '',
1313
<UserImg src={userImg} alt={`${nickname}'s profile`} />
1414
<UserDetailsContainer>
1515
<StyledText $textTheme={{ style: 'headline2-bold' }}>{nickname}</StyledText>
16-
<StyledBio $textTheme={{ style: 'body2-regular' }} color={theme.colors.gray3}>
16+
<StyledBio $textTheme={{ style: 'body2-regular' }} color={theme.colors.text.tertiary}>
1717
{truncatedBio}
1818
</StyledBio>
1919
</UserDetailsContainer>

src/pages/Login/SocialLoginButton/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const SocialLoginButton: React.FC<SocialLoginProps> = ({ bgColor, logoSrc, altTe
2727
</LogoImgWrapper>
2828
<StyledTextWrapper
2929
$textTheme={{ style: 'body2-bold' }}
30-
color={provider === 'kakao' ? theme.colors.black : theme.colors.white}
30+
color={provider === 'kakao' ? theme.colors.text.primary : theme.colors.text.contrast}
3131
>
3232
{buttonText}
3333
</StyledTextWrapper>

src/pages/Login/SocialLoginButton/style.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import styled from 'styled-components';
22
import { StyledText } from '@components/Text/StyledText';
33

4-
export const SocialLoginContainer = styled.button<{ $bgColor: string; $border?: boolean }>`
4+
export const SocialLoginContainer = styled.button<{ $bgColor: string }>`
55
display: flex;
66
align-items: center;
77
width: calc(100% - 3.5rem);
88
max-width: 40rem;
99
height: 3.5rem;
1010
background-color: ${({ $bgColor }) => $bgColor};
1111
border-radius: 0.5rem;
12-
border: ${({ $border }) => ($border ? '1px solid #000' : 'none')};
1312
cursor: pointer;
1413
margin-bottom: 0.5rem;
1514
box-sizing: border-box;
@@ -28,10 +27,10 @@ export const LogoImage = styled.img`
2827
max-height: 100%;
2928
`;
3029

31-
export const StyledTextWrapper = styled(StyledText)<{ $left?: string }>`
30+
export const StyledTextWrapper = styled(StyledText)`
3231
display: flex;
3332
width: 12.5rem;
34-
padding-left: ${({ $left }) => $left || '1.2rem'};
33+
padding-left: 1.2rem;
3534
align-items: center;
3635
margin: 0 auto;
3736
`;

src/pages/Login/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const Login: React.FC = () => {
1414
return (
1515
<OODDFrame>
1616
<LoginContainer>
17-
<StyledWelcomeWrapper $textTheme={{ style: 'title2-bold' }} color={theme.colors.black}>
17+
<StyledWelcomeWrapper $textTheme={{ style: 'title2-bold' }} color={theme.colors.text.primary}>
1818
{'반가워요! \n계정을 선택해주세요.'}
1919
</StyledWelcomeWrapper>
2020
<SocialLoginButton

src/pages/SignUp/style.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const InputContainer = styled.section`
5555

5656
export const InputValue = styled.input`
5757
width: 100%;
58-
max-width: 300px;
58+
max-width: 18.75rem;
5959
height: 3.25rem;
6060
font-family: Pretendard;
6161
font-size: 2.5rem;

src/pages/TermsAgreement/styles.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import styled from 'styled-components';
22
import { StyledText } from '@components/Text/StyledText';
3+
import theme from '@styles/theme';
34

45
export const TermsAgreementLayout = styled.main`
56
display: flex;
@@ -29,12 +30,12 @@ export const CheckboxInput = styled.input`
2930
appearance: none; /* 기본 스타일 제거 */
3031
width: 1.25rem;
3132
height: 1.25rem;
32-
border: 0.125rem solid #e0e0e0;
33+
border: 0.125rem solid ${theme.colors.border.divider};
3334
border-radius: 0.25rem;
3435
position: relative;
3536
&:checked {
36-
background-color: #ffbbda;
37-
border-color: #ff2389;
37+
background-color: ${theme.colors.brand.primaryLighter};
38+
border-color: ${theme.colors.brand.primary};
3839
}
3940
&:checked::after {
4041
content: '✓';
@@ -49,7 +50,7 @@ export const CheckboxInput = styled.input`
4950

5051
export const Divider = styled.hr`
5152
border: none;
52-
border-top: 0.0625rem solid #e0e0e0;
53+
border-top: 0.0625rem solid ${theme.colors.border.divider};
5354
margin: 0.625rem 0;
5455
`;
5556

0 commit comments

Comments
 (0)