Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix-fe: fallback 페이지 QA #613

Merged
merged 3 commits into from
Aug 22, 2024
Merged

fix-fe: fallback 페이지 QA #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab538ec
Create draft PR for #612
github-actions[bot] Aug 22, 2024
f2d83ef
fix: 401 fallback 페이지의 navigate 주소 변경
llqqssttyy Aug 22, 2024
d90df93
feat: 에러 페이지 반응형 적용
llqqssttyy Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/pages/ErrorPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ const ErrorMessages: Record<number | string, ErrorMessageConfig> = {
buttons: [
{
label: '로그인',
to: '/login',
to: '/sign-in',
color: 'primary',
},
{
label: '회원가입',
to: '/signup',
to: '/sign-up',
color: 'white',
},
],
Expand Down
38 changes: 38 additions & 0 deletions frontend/src/pages/ErrorPage/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ const Wrapper = styled.div`

padding: 0 16rem;
color: ${({ theme }) => theme.colors.text.default};

@media (max-width: ${({ theme }) => theme.breakpoints.tablet}) {
padding: 0 4rem;
gap: 2rem;
}

@media (max-width: ${({ theme }) => theme.breakpoints.mobile}) {
padding: 0 2.4rem;
gap: 1.6rem;
}
`;

const StatusCode = styled.h1`
Expand All @@ -20,16 +30,44 @@ const StatusCode = styled.h1`
font-weight: 700;

color: ${({ theme }) => theme.colors.brand.primary};

@media (max-width: ${({ theme }) => theme.breakpoints.tablet}) {
font-size: 10rem;
line-height: 10rem;
}

@media (max-width: ${({ theme }) => theme.breakpoints.mobile}) {
font-size: 8rem;
line-height: 8rem;
}
`;

const Title = styled.h2`
${({ theme }) => theme.typography.heading[900]};

@media (max-width: ${({ theme }) => theme.breakpoints.tablet}) {
${({ theme }) => theme.typography.heading[800]};
}

@media (max-width: ${({ theme }) => theme.breakpoints.mobile}) {
${({ theme }) => theme.typography.heading[600]};
}
`;

const Description = styled.p`
${({ theme }) => theme.typography.common.large};
white-space: pre-line;
line-height: 3rem; // 3rem = line-height of 2rem + paragraph spacing of 1rem

@media (max-width: ${({ theme }) => theme.breakpoints.tablet}) {
${({ theme }) => theme.typography.common.default};
line-height: 2.4rem; // 3rem = line-height of 1.4 + paragraph spacing of 1rem
}

@media (max-width: ${({ theme }) => theme.breakpoints.mobile}) {
${({ theme }) => theme.typography.common.small};
line-height: 2rem; // 3rem = line-height of 1.2 + paragraph spacing of 0.8rem
}
`;

const ButtonContainer = styled.div`
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/styles/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ const colors: Colors = {
};

const breakpoints = {
mobile: '60rem',
tablet: '90rem',
desktop: '1800rem',
mobile: '48rem',
tablet: '76.8rem',
desktop: '120rem',
Comment on lines +80 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

desktop이 1800rem으로 되어 있었군요... 수정사항 감사히 확인했습니다!

};

const typography = {
Expand Down
Loading