Skip to content

Commit

Permalink
Merge pull request #374 from Bamdoliro/feat/#369
Browse files Browse the repository at this point in the history
H5 폰트 굵기 수정
  • Loading branch information
arkk200 authored Sep 10, 2023
2 parents 7865aa7 + b6e1c8c commit d8319c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions apps/admin/src/components/common/SideBar/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const SideNavigationBar = styled.div`
`;

const StyledLink = styled(Link)<{ $active: boolean }>`
${font.btn1}
${font.H5}
position: relative;
${flex({ alignItems: 'center' })}
width: 100%;
Expand Down Expand Up @@ -111,7 +111,7 @@ const StyledLink = styled(Link)<{ $active: boolean }>`
`;

const LogoutButton = styled.button`
${font.btn1}
${font.H5}
${flex({ alignItems: 'center' })}
height: 56px;
padding: 0px 36px;
Expand Down
2 changes: 1 addition & 1 deletion packages/maru-theme/src/font.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const font = {
H2: fontGenerator(700, 1.75, 140, 0),
H3: fontGenerator(600, 1.5, 140, 0.15),
H4: fontGenerator(600, 1.25, 140, 0.15),
H5: fontGenerator(600, 1.125, 140, 0.15),
H5: fontGenerator(500, 1.125, 140, 0.15),

p1: fontGenerator(400, 1.125, 140, -0.15),
p2: fontGenerator(400, 1, 160, 0),
Expand Down

0 comments on commit d8319c9

Please sign in to comment.