Skip to content

Commit

Permalink
Merge branch 'develop' into feat/#52/class
Browse files Browse the repository at this point in the history
  • Loading branch information
hansoojeongsj committed Jan 15, 2025
2 parents e86a017 + ad95f9c commit e5b25ba
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions src/styles/theme.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,49 +59,49 @@ export const vars = createGlobalTheme(':root', {
fontWeight: '600',
fontSize: '2.8rem',
lineHeight: '4rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.14rem',
},
h2: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '2.4rem',
lineHeight: '3.6rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.12rem',
},
h3: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '2rem',
lineHeight: '2.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.1rem',
},
h4: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '2rem',
lineHeight: '2.4rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.1rem',
},
h5: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.8rem',
lineHeight: '2.6rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.09rem',
},
h6: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.6rem',
lineHeight: '1.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.08rem',
},
h7: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.6rem',
lineHeight: '2rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.08rem',
},

// body
Expand All @@ -110,70 +110,70 @@ export const vars = createGlobalTheme(':root', {
fontWeight: '400',
fontSize: '1.4rem',
lineHeight: '1.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.1rem',
},
b2: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '1.4rem',
lineHeight: '1.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.07rem',
},
b3: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '1.4rem',
lineHeight: '2rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.07rem',
},
b4: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.4rem',
lineHeight: '1.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.07rem',
},
b5: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.4rem',
lineHeight: '2.2rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.07rem',
},
b6: {
fontFamily: pretendard,
fontWeight: '400',
fontSize: '1.2rem',
lineHeight: '1.6rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.06rem',
},
b7: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '1.2rem',
lineHeight: '1.6rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.06rem',
},
b8: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '1.2rem',
lineHeight: '1.6rem',
letterSpacing: '-0.8%',
letterSpacing: '-0.096rem',
},
b9: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.2rem',
lineHeight: '1.6rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.06rem',
},
b10: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1.2rem',
lineHeight: '1.6rem',
letterSpacing: '-0.8%',
letterSpacing: '-0.096rem',
},

// caption
Expand All @@ -182,28 +182,28 @@ export const vars = createGlobalTheme(':root', {
fontWeight: '400',
fontSize: '1rem',
lineHeight: '1.4rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.05rem',
},
c2: {
fontFamily: pretendard,
fontWeight: '400',
fontSize: '1rem',
lineHeight: '1.4rem',
letterSpacing: '-0.8%',
letterSpacing: '-0.08rem',
},
c3: {
fontFamily: pretendard,
fontWeight: '500',
fontSize: '1rem',
lineHeight: '1.8rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.05rem',
},
c4: {
fontFamily: pretendard,
fontWeight: '600',
fontSize: '1rem',
lineHeight: '1.4rem',
letterSpacing: '-0.5%',
letterSpacing: '-0.05rem',
},
},
});

0 comments on commit e5b25ba

Please sign in to comment.