Skip to content

Commit

Permalink
Design/#16: 디자인 시스템 수정사항 반영
Browse files Browse the repository at this point in the history
  • Loading branch information
gonn-i committed Jan 13, 2025
1 parent 6c14ce8 commit a798041
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/components/common/modal/component/ModalBtns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const SingleBtn = ({ singleBtnContent, handleClose }: ModalBtnsProps) => {
export { DobbleBtns, SingleBtn };

const Button = styled.button`
${({ theme }) => theme.fonts.body_16_b};
${({ theme }) => theme.fonts.body_16_b_1};
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -50,8 +50,8 @@ const S = {
color: ${({ theme, $isPrimary }) => ($isPrimary ? theme.colors.white1 : theme.colors.black)};
background: ${({ theme, $isPrimary }) => ($isPrimary ? theme.colors.iris1 : theme.colors.gray4)};
border: 1px solid ${({ theme }) => theme.colors.gray3};
background: ${({ theme, $isPrimary }) => ($isPrimary ? theme.colors.iris1 : theme.colors.gray6)};
border: 1px solid ${({ theme }) => theme.colors.gray4};
border-top: none;
border-bottom: none;
border-bottom-right-radius: ${({ order }) => (order ? '2rem' : '0')};
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/modal/component/ModalWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const S = {
background: ${({ theme }) => theme.colors.white1};
box-shadow: 0 0 12px 0 ${({ theme }) => theme.colors.shadow1};
border: 1px solid ${({ theme }) => theme.colors.gray3};
border: 1px solid ${({ theme }) => theme.colors.gray4};
border-radius: 2rem;
`,
};
13 changes: 10 additions & 3 deletions src/styles/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ const colors = {
black_toast: ' rgba(33, 33, 33, 0.40)',
gray1: '#565959',
gray2: '#848688',
gray3: '#CCCCCC',
gray4: '#F0F2F2',
gray3: '#ACACAC',
gray4: '#CCCCCC',
gray5: '#EBEBEB',
gray6: '#F0F2F2',
shadow1: 'rgba(211, 211, 211, 0.63)',
};

Expand Down Expand Up @@ -66,11 +68,16 @@ const fonts = {
font-family: 'AppleSDGothicNeoR00', sans-serif;
line-height: 4rem;
`,
body_16_b: css`
body_16_b_1: css`
font-size: 1.6rem;
font-family: 'AppleSDGothicNeoB00', sans-serif;
line-height: 3.2rem;
`,
body_16_b_2: css`
font-size: 1.6rem;
font-family: 'AppleSDGothicNeoB00', sans-serif;
line-height: 2rem;
`,
body_16_m: css`
font-size: 1.6rem;
font-family: 'AppleSDGothicNeoB00', sans-serif;
Expand Down

0 comments on commit a798041

Please sign in to comment.