Skip to content

Commit 0c8fba7

Browse files
Merge pull request #45 from SOPT-36-NINEDOT/refac/#44/rem
[Fix]: rem 기준 변경
2 parents a9a7313 + 6bb3013 commit 0c8fba7

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

src/style/global.css.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { globalStyle } from '@vanilla-extract/css';
33
import './reset.css.ts';
44

55
globalStyle('html', {
6-
fontSize: '100%',
6+
fontSize: '62.5%',
77
});
88

99
globalStyle('body', {

src/style/token/typography.css.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
11
export const fonts = {
22
display01: {
3-
fontSize: '3.375rem', // 54px
3+
fontSize: '5.4rem',
44
fontWeight: '700',
55
lineHeight: '140%',
66
},
77
display02: {
8-
fontSize: '1.75rem', // 28px
8+
fontSize: '2.8rem',
99
fontWeight: '700',
1010
lineHeight: '140%',
1111
},
1212
title01: {
13-
fontSize: '1.75rem', // 28px
13+
fontSize: '2.8rem',
1414
fontWeight: '600',
1515
lineHeight: '140%',
1616
},
1717
title02: {
18-
fontSize: '1.75rem', // 28px
18+
fontSize: '2.8rem',
1919
fontWeight: '300',
2020
lineHeight: '140%',
2121
},
2222
title03: {
23-
fontSize: '1.5rem', // 24px
23+
fontSize: '2.4rem',
2424
fontWeight: '700',
2525
lineHeight: '140%',
2626
},
2727
title04: {
28-
fontSize: '1.5rem', // 24px
28+
fontSize: '2.4rem',
2929
fontWeight: '600',
3030
lineHeight: '140%',
3131
},
3232
subtitle01: {
33-
fontSize: '1.25rem', // 20px
33+
fontSize: '2rem',
3434
fontWeight: '700',
3535
lineHeight: '140%',
3636
},
3737
subtitle02: {
38-
fontSize: '1.25rem', // 20px
38+
fontSize: '2rem',
3939
fontWeight: '600',
4040
lineHeight: '140%',
4141
},
4242
subtitle03: {
43-
fontSize: '1.25rem', // 20px
43+
fontSize: '2rem',
4444
fontWeight: '500',
4545
lineHeight: '140%',
4646
},
4747
subtitle04: {
48-
fontSize: '1.25rem', // 20px
48+
fontSize: '2rem',
4949
fontWeight: '400',
5050
lineHeight: '140%',
5151
},
5252
subtitle05: {
53-
fontSize: '1.125rem', // 18px
53+
fontSize: '1.8rem',
5454
fontWeight: '700',
5555
lineHeight: '140%',
5656
},
5757
subtitle06: {
58-
fontSize: '1.125rem', // 18px
58+
fontSize: '1.8rem',
5959
fontWeight: '400',
6060
lineHeight: '140%',
6161
},
6262
body01: {
63-
fontSize: '1rem', // 16px
63+
fontSize: '1.6rem',
6464
fontWeight: '700',
6565
lineHeight: '140%',
6666
},
6767
body02: {
68-
fontSize: '1rem', // 16px
68+
fontSize: '1.6rem',
6969
fontWeight: '500',
7070
lineHeight: '140%',
7171
},
7272
body03: {
73-
fontSize: '1rem', // 16px
73+
fontSize: '1.6rem',
7474
fontWeight: '400',
7575
lineHeight: '140%',
7676
},
7777
body04: {
78-
fontSize: '0.875rem', // 14px
78+
fontSize: '1.4rem',
7979
fontWeight: '700',
8080
lineHeight: '140%',
8181
},
8282
body05: {
83-
fontSize: '0.875rem', // 14px
83+
fontSize: '1.4rem',
8484
fontWeight: '400',
8585
lineHeight: '140%',
8686
},
8787
caption01: {
88-
fontSize: '0.75rem', // 12px
88+
fontSize: '1.2rem',
8989
fontWeight: '700',
9090
lineHeight: '140%',
9191
},
9292
caption02: {
93-
fontSize: '0.75rem', // 12px
93+
fontSize: '1.2rem',
9494
fontWeight: '400',
9595
lineHeight: '140%',
9696
},

0 commit comments

Comments
 (0)