Skip to content

Commit

Permalink
Merge pull request #604 from TEAM-TATTOUR/S1/#603-tapbar
Browse files Browse the repository at this point in the history
[SideMenu] 탭바 QA 반영
  • Loading branch information
lydiacho authored Feb 22, 2024
2 parents 40e463c + 22935f9 commit db726ee
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 6 deletions.
10 changes: 6 additions & 4 deletions src/common/SideMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const St = {
justify-content: space-between;
width: 100%;
padding-left: 3rem;
padding-right: 2.4rem;
padding-right: 1.8rem;
text-align: center;
Expand All @@ -196,19 +196,21 @@ const St = {
`,

SideMenuCSButton: styled.button`
${({ theme }) => theme.fonts.body_medium_14};
${({ theme }) => theme.fonts.body_bold_14};
color: ${({ theme }) => theme.colors.gray3};
padding-right: 1.2rem;
`,

Delimeter: styled.div`
width: 0.1rem;
height: 1.4rem;
border: 0.1rem solid ${({ theme }) => theme.colors.gray1};
border: 0.01rem solid ${({ theme }) => theme.colors.gray1};
`,

SideMenuLogOutButton: styled.button`
${({ theme }) => theme.fonts.body_medium_14};
${({ theme }) => theme.fonts.body_bold_14};
color: ${({ theme }) => theme.colors.gray3};
padding-left: 1.2rem;
`,
};

Expand Down
4 changes: 2 additions & 2 deletions src/common/SideMenuUserInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const SideMenuUserInfo = ({ isLogin }: { isLogin: boolean }) => {
) : (
<St.SideMenuAnonymousSection>
<St.SideMenuLoginButton onClick={handleClickLoginButton}>
<St.SideMenuAnoymousTitle>로그인이 필요합니다</St.SideMenuAnoymousTitle>
<St.SideMenuAnoymousTitle>로그인이 필요해요</St.SideMenuAnoymousTitle>
<IcArrowRightLight />
</St.SideMenuLoginButton>
</St.SideMenuAnonymousSection>
Expand All @@ -37,7 +37,7 @@ const St = {
`,

SideMenuAnoymousTitle: styled.h2`
font: ${({ theme }) => theme.fonts.title_semibold_16};
${({ theme }) => theme.fonts.title_bold_16};
color: ${({ theme }) => theme.colors.gray1};
`,
};
Expand Down
2 changes: 2 additions & 0 deletions src/styles/style.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ declare module 'styled-components' {
title_regular_20: SerializedStyles;
title_semibold_18: SerializedStyles;
title_semibold_16: SerializedStyles;
title_bold_16: SerializedStyles;
title_medium_18: SerializedStyles;
title_line_medium_18: SerializedStyles;
title_line_medium_16: SerializedStyles;
title_semibold_16: SerializedStyles;
body_medium_16: SerializedStyles;
body_semibold_14: SerializedStyles;
body_bold_14: SerializedStyles;
body_medium_14: SerializedStyles;
body_line_medium_14: SerializedStyles;
body_underline_medium_14: SerializedStyles;
Expand Down
20 changes: 20 additions & 0 deletions src/styles/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,16 @@ const fonts = {
line-height: 130%;
letter-spacing: -0.014rem;
`,
body_bold_14: css`
font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI',
'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', sans-serif;
font-size: 1.4rem;
font-style: normal;
font-weight: 700;
line-height: 130%;
letter-spacing: -0.014rem;
`,
body_line_medium_14: css`
font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI',
'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji',
Expand Down Expand Up @@ -266,6 +276,16 @@ const fonts = {
line-height: 130%;
letter-spacing: 0.054rem;
`,
title_bold_16: css`
font-family: 'Pretendard Variable', system-ui, 'Helvetica Neue', 'Segoe UI',
'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic', 'Apple Color Emoji', 'Segoe UI Emoji',
'Segoe UI Symbol', sans-serif;
font-size: 1.6rem;
font-style: normal;
font-weight: 700;
line-height: 130%;
letter-spacing: -0.016rem;
`
};

const theme: DefaultTheme = {
Expand Down

0 comments on commit db726ee

Please sign in to comment.