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.

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

hotfix: 폰트크기 축소, 카드 캐러셀 크기 조절 #121

Merged
merged 4 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { theme } from "@watermelon-clap/core/src/theme";

export const eventCard = (isMainEvent: boolean) => css`
padding: 72px;
background: ${isMainEvent ? theme.color.mainEventCardBg : theme.color.white};
background: ${isMainEvent
? theme.color.mainEventCardBg
: "linear-gradient(194deg, #dffbdd 3.1%, #d2ecff 33.71%, #d2e5d8 78.87%, #e5c7f1 103.46%)"};

width: 452px;
border-radius: 20px;
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ export const CardCarousel = () => {
const settings = {
infinite: true,
speed: 800,
slidesToShow: 3,
slidesToShow: 4,
slidesToScroll: 1,
initialSlide: 0,
autoplay: true,
autoplaySpeed: 1500,
arrows: false,
draggable: false,

responsive: [
{
Expand Down
5 changes: 5 additions & 0 deletions packages/service/src/pages/Error/Error.css.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { css } from "@emotion/react";
import { mobile } from "@service/common/responsive/responsive";
import { theme } from "@watermelon-clap/core/src/theme";

export const errorContainerStyle = css`
Expand All @@ -10,6 +11,7 @@ export const errorContainerStyle = css`
${theme.flex.column}
${theme.gap.gap32}


height: 100vh;
`;

Expand All @@ -20,4 +22,7 @@ export const errorMessageStyle = css`

export const loginText = css`
color: white;
${mobile(css`
font-size: 24px;
`)}
`;
5 changes: 4 additions & 1 deletion packages/service/src/pages/Error/Error.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useErrorBoundary } from "react-error-boundary";
import { GlobalNavigationBar } from "@service/common/components/GlobalNavigationBar";
import { Space } from "@service/common/styles/Space";
import { useAuth } from "@watermelon-clap/core/src/hooks";
import { useMobile } from "@service/common/hooks/useMobile";

export const Error = ({ error, resetErrorBoundary }: FallbackProps) => {
const navigate = useNavigate();
Expand All @@ -15,6 +16,8 @@ export const Error = ({ error, resetErrorBoundary }: FallbackProps) => {

const { login } = useAuth();

const mobile = useMobile();

switch (error.message) {
case "404":
errorMessage =
Expand Down Expand Up @@ -49,7 +52,7 @@ export const Error = ({ error, resetErrorBoundary }: FallbackProps) => {
{error.message === "403" ? (
<div css={theme.flex.column}>
<h1 css={loginText}>로그인이 필요한 서비스입니다</h1>
<Space size={20} />
<Space size={mobile ? 10 : 20} />
<Button variant={ButtonVariant.LONG} onClick={handleLogin}>
로그인
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const mainBg = css`
export const pageTitle = css`
text-align: center;
${theme.font.pcpB}
font-size : calc(50px + 2vw);
font-size : calc(26px + 2vw);
padding-top: 120px;
color: ${theme.color.white};

Expand Down
Loading