Skip to content

Commit cced319

Browse files
committed
chore: 디자인 시스템 반영
- 디자인 시스템 반영해서 컴포넌트 수정
1 parent 4f7af21 commit cced319

File tree

7 files changed

+89
-89
lines changed

7 files changed

+89
-89
lines changed

apps/web/src/components/DefaultComponent/DefaultComponent.styles.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { mq } from '@meme_wiki/ui';
44
export const Container = styled.div`
55
padding: 16px;
66
min-height: 100vh;
7-
background-color: ${({ theme }) => theme.palette.gray[100]};
7+
background-color: ${({ theme }) => theme.palette.gray['gray-1']};
88
99
${mq.tablet} {
1010
padding: 24px;
@@ -41,27 +41,27 @@ export const Section = styled.section`
4141
`;
4242

4343
export const Title = styled.h1`
44-
${({ theme }) => theme.typography.heading.h3};
45-
color: ${({ theme }) => theme.palette.gray[900]};
44+
${({ theme }) => theme.typography.title['subhead-long1']};
45+
color: ${({ theme }) => theme.palette.gray['gray-9']};
4646
margin-bottom: 16px;
4747
4848
${mq.tablet} {
49-
${({ theme }) => theme.typography.heading.h2};
49+
${({ theme }) => theme.typography.title['subhead-long1']};
5050
margin-bottom: 24px;
5151
}
5252
5353
${mq.desktop} {
54-
${({ theme }) => theme.typography.heading.h1};
54+
${({ theme }) => theme.typography.title['subhead-long1']};
5555
}
5656
`;
5757

5858
export const Description = styled.p`
59-
${({ theme }) => theme.typography.body.medium};
60-
color: ${({ theme }) => theme.palette.gray[600]};
59+
${({ theme }) => theme.typography.body['body-long1']};
60+
color: ${({ theme }) => theme.palette.gray['gray-6']};
6161
margin-bottom: 24px;
6262
6363
${mq.tablet} {
64-
${({ theme }) => theme.typography.body.large};
64+
${({ theme }) => theme.typography.body['body-long1']};
6565
max-width: 80%;
6666
margin: 0 auto 32px;
6767
}
@@ -83,33 +83,33 @@ export const ButtonContainer = styled.div`
8383
`;
8484

8585
export const Button = styled.a`
86-
${({ theme }) => theme.typography.button.button2};
86+
${({ theme }) => theme.typography.title['subhead-long1']};
8787
display: flex;
8888
align-items: center;
8989
justify-content: center;
9090
padding: 12px 24px;
9191
border-radius: 8px;
9292
text-decoration: none;
9393
transition: all 0.2s ease-in-out;
94-
background-color: ${({ theme }) => theme.palette.primary};
95-
color: ${({ theme }) => theme.palette.white};
94+
background-color: ${({ theme }) => theme.palette.main.blue[50]};
95+
color: ${({ theme }) => theme.palette.common.white};
9696
border: none;
9797
9898
&:hover {
99-
background-color: ${({ theme }) => theme.palette.primaryDark};
99+
background-color: ${({ theme }) => theme.palette.main.blue[40]};
100100
}
101101
102102
${mq.tablet} {
103-
${({ theme }) => theme.typography.button.button1};
103+
${({ theme }) => theme.typography.title['subhead-long1']};
104104
padding: 14px 28px;
105105
}
106106
107107
&.secondary {
108-
background-color: ${({ theme }) => theme.palette.gray[200]};
109-
color: ${({ theme }) => theme.palette.gray[900]};
108+
background-color: ${({ theme }) => theme.palette.common.white};
109+
color: ${({ theme }) => theme.palette.common.black};
110110
111111
&:hover {
112-
background-color: ${({ theme }) => theme.palette.gray[300]};
112+
background-color: ${({ theme }) => theme.palette.gray['gray-2']};
113113
}
114114
}
115115
`;

apps/web/src/components/Layout/Layout.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const Layout = styled.main`
77
width: 100%;
88
height: 100vh;
99
max-width: ${breakpoints.mobile};
10-
border: 1px solid ${({ theme }) => theme.palette.gray[800]};
10+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-8']};
1111
margin: 0 auto;
1212
`;
1313

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import styled from '@emotion/styled';
22

33
const Title = styled.h1`
4-
${({ theme }) => theme.typography.heading.h3};
5-
color: ${({ theme }) => theme.palette.gray[900]};
4+
${({ theme }) => theme.typography.title['subhead-long1']};
5+
color: ${({ theme }) => theme.palette.gray['gray-9']};
66
`;
77

88
export { Title };

apps/web/src/pages/MemeQuizPage/MemeQuizPage.styles.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ const NavigationContainer = styled.div`
1919
const BackButton = styled.button`
2020
padding: 8px 16px;
2121
border-radius: 8px;
22-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
23-
background-color: ${({ theme }) => theme.palette.white};
24-
color: ${({ theme }) => theme.palette.gray[900]};
22+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
23+
background-color: ${({ theme }) => theme.palette.common.white};
24+
color: ${({ theme }) => theme.palette.common.black};
2525
cursor: pointer;
2626
transition: all 0.2s ease-in-out;
2727
display: flex;
2828
align-items: center;
2929
gap: 4px;
3030
3131
&:hover {
32-
background-color: ${({ theme }) => theme.palette.gray[100]};
32+
background-color: ${({ theme }) => theme.palette.gray['gray-1']};
3333
}
3434
3535
&:disabled {
@@ -46,14 +46,14 @@ const QuizImage = styled.img`
4646
`;
4747

4848
const Title = styled.h1`
49-
${({ theme }) => theme.typography.heading.h3};
50-
color: ${({ theme }) => theme.palette.gray[900]};
49+
${({ theme }) => theme.typography.title['subhead-long1']};
50+
color: ${({ theme }) => theme.palette.gray['gray-9']};
5151
text-align: center;
5252
`;
5353

5454
const Summary = styled.p`
55-
${({ theme }) => theme.typography.body.medium};
56-
color: ${({ theme }) => theme.palette.gray[700]};
55+
${({ theme }) => theme.typography.body['body-long1']};
56+
color: ${({ theme }) => theme.palette.gray['gray-7']};
5757
text-align: center;
5858
`;
5959

@@ -69,17 +69,17 @@ const Button = styled.button<{ isSelected?: boolean }>`
6969
width: 100%;
7070
padding: 12px;
7171
border-radius: 8px;
72-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
72+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
7373
background-color: ${({ theme, isSelected }) =>
74-
isSelected ? theme.palette.primary : theme.palette.white};
74+
isSelected ? theme.palette.main.blue[50] : theme.palette.common.white};
7575
color: ${({ theme, isSelected }) =>
76-
isSelected ? theme.palette.white : theme.palette.gray[900]};
76+
isSelected ? theme.palette.common.white : theme.palette.common.black};
7777
cursor: pointer;
7878
transition: all 0.2s ease-in-out;
7979
8080
&:hover {
8181
background-color: ${({ theme, isSelected }) =>
82-
isSelected ? theme.palette.primaryDark : theme.palette.gray[100]};
82+
isSelected ? theme.palette.main.blue[40] : theme.palette.gray['gray-1']};
8383
}
8484
`;
8585

apps/web/src/pages/MemeQuizPage/components/MemeQuizResult/MemeQuizResult.styles.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ const NavigationContainer = styled.div`
1919
const BackButton = styled.button`
2020
padding: 8px 16px;
2121
border-radius: 8px;
22-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
23-
background-color: ${({ theme }) => theme.palette.white};
24-
color: ${({ theme }) => theme.palette.gray[900]};
22+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
23+
background-color: ${({ theme }) => theme.palette.common.white};
24+
color: ${({ theme }) => theme.palette.common.black};
2525
cursor: pointer;
2626
transition: all 0.2s ease-in-out;
2727
display: flex;
2828
align-items: center;
2929
gap: 4px;
3030
3131
&:hover {
32-
background-color: ${({ theme }) => theme.palette.gray[100]};
32+
background-color: ${({ theme }) => theme.palette.gray['gray-1']};
3333
}
3434
3535
&:disabled {
@@ -46,14 +46,14 @@ const QuizImage = styled.img`
4646
`;
4747

4848
const Title = styled.h1`
49-
${({ theme }) => theme.typography.heading.h3};
50-
color: ${({ theme }) => theme.palette.gray[900]};
49+
${({ theme }) => theme.typography.title['subhead-long1']};
50+
color: ${({ theme }) => theme.palette.gray['gray-9']};
5151
text-align: center;
5252
`;
5353

5454
const Summary = styled.p`
55-
${({ theme }) => theme.typography.body.medium};
56-
color: ${({ theme }) => theme.palette.gray[700]};
55+
${({ theme }) => theme.typography.body['body-long1']};
56+
color: ${({ theme }) => theme.palette.gray['gray-7']};
5757
text-align: center;
5858
`;
5959

@@ -69,17 +69,17 @@ const Button = styled.button<{ isSelected?: boolean }>`
6969
width: 100%;
7070
padding: 12px;
7171
border-radius: 8px;
72-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
72+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
7373
background-color: ${({ theme, isSelected }) =>
74-
isSelected ? theme.palette.primary : theme.palette.white};
74+
isSelected ? theme.palette.main.blue[50] : theme.palette.common.white};
7575
color: ${({ theme, isSelected }) =>
76-
isSelected ? theme.palette.white : theme.palette.gray[900]};
76+
isSelected ? theme.palette.common.white : theme.palette.common.black};
7777
cursor: pointer;
7878
transition: all 0.2s ease-in-out;
7979
8080
&:hover {
8181
background-color: ${({ theme, isSelected }) =>
82-
isSelected ? theme.palette.primaryDark : theme.palette.gray[100]};
82+
isSelected ? theme.palette.main.blue[40] : theme.palette.gray['gray-1']};
8383
}
8484
`;
8585

apps/web/src/pages/MemeQuizPage/components/QuizStep/QuizStep.styles.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ const NavigationContainer = styled.div`
1919
const BackButton = styled.button`
2020
padding: 8px 16px;
2121
border-radius: 8px;
22-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
23-
background-color: ${({ theme }) => theme.palette.white};
24-
color: ${({ theme }) => theme.palette.gray[900]};
22+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
23+
background-color: ${({ theme }) => theme.palette.common.white};
24+
color: ${({ theme }) => theme.palette.common.black};
2525
cursor: pointer;
2626
transition: all 0.2s ease-in-out;
2727
display: flex;
2828
align-items: center;
2929
gap: 4px;
3030
3131
&:hover {
32-
background-color: ${({ theme }) => theme.palette.gray[100]};
32+
background-color: ${({ theme }) => theme.palette.gray['gray-1']};
3333
}
3434
3535
&:disabled {
@@ -46,14 +46,14 @@ const QuizImage = styled.img`
4646
`;
4747

4848
const Title = styled.h1`
49-
${({ theme }) => theme.typography.heading.h3};
50-
color: ${({ theme }) => theme.palette.gray[900]};
49+
${({ theme }) => theme.typography.title['subhead-long1']};
50+
color: ${({ theme }) => theme.palette.gray['gray-9']};
5151
text-align: center;
5252
`;
5353

5454
const Summary = styled.p`
55-
${({ theme }) => theme.typography.body.medium};
56-
color: ${({ theme }) => theme.palette.gray[700]};
55+
${({ theme }) => theme.typography.body['body-long1']};
56+
color: ${({ theme }) => theme.palette.gray['gray-7']};
5757
text-align: center;
5858
`;
5959

@@ -69,17 +69,17 @@ const Button = styled.button<{ isSelected?: boolean }>`
6969
width: 100%;
7070
padding: 12px;
7171
border-radius: 8px;
72-
border: 1px solid ${({ theme }) => theme.palette.gray[300]};
72+
border: 1px solid ${({ theme }) => theme.palette.gray['gray-3']};
7373
background-color: ${({ theme, isSelected }) =>
74-
isSelected ? theme.palette.primary : theme.palette.white};
74+
isSelected ? theme.palette.main.blue[50] : theme.palette.common.white};
7575
color: ${({ theme, isSelected }) =>
76-
isSelected ? theme.palette.white : theme.palette.gray[900]};
76+
isSelected ? theme.palette.common.white : theme.palette.common.black};
7777
cursor: pointer;
7878
transition: all 0.2s ease-in-out;
7979
8080
&:hover {
8181
background-color: ${({ theme, isSelected }) =>
82-
isSelected ? theme.palette.primaryDark : theme.palette.gray[100]};
82+
isSelected ? theme.palette.main.blue[40] : theme.palette.gray['gray-1']};
8383
}
8484
`;
8585

0 commit comments

Comments
 (0)