Skip to content

Commit

Permalink
Merge pull request #30 from whatever-mentoring/feature/onboarding
Browse files Browse the repository at this point in the history
feat: 온보딩 바로 로그인하기 링크 추가
  • Loading branch information
chaeyeonan authored Sep 24, 2023
2 parents 8a664d4 + 634c59c commit 236ec9b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/assets/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const EntireContainer = styled.div<{
padding: ${({ padding }) => (padding ? padding : '25px 30px')};
background: ${({ background }) => (background ? background : Palette.White)};
height: ${({ homebar }) =>
homebar ? 'calc(100dvh - 156px)' : 'calc(100dvh - 60px)'};
homebar ? 'calc(100dvh - 140px)' : 'calc(100dvh - 60px)'};
overflow: auto;
&::-webkit-scrollbar {
Expand Down
9 changes: 8 additions & 1 deletion src/pages/Onboarding/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,14 @@ export const Onboarding = () => {
<Typo.h5>{currentSlide === 4 ? '시작' : '다음'}</Typo.h5>
</StyledButton>
</StyledLink>
<Typo.b3 color={Palette.Gray5}>바로 로그인하기</Typo.b3>
<StyledLink to="/signup">
<Typo.b3
color={Palette.Gray5}
style={{ textDecoration: 'underline' }}
>
바로 로그인하기
</Typo.b3>
</StyledLink>
</TextContainer>
</Container>
);
Expand Down

0 comments on commit 236ec9b

Please sign in to comment.