From 82ca7dc1d54265b2bba3e2c3010386f794c5d89b Mon Sep 17 00:00:00 2001 From: KANGYONGSU23 Date: Tue, 12 Dec 2023 17:33:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?design=20::=20body=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/account/layout.tsx | 1 + src/app/globals.css | 9 +-------- src/app/layout.tsx | 7 ++++++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/app/account/layout.tsx b/src/app/account/layout.tsx index cae8dbd..3e30fe6 100644 --- a/src/app/account/layout.tsx +++ b/src/app/account/layout.tsx @@ -3,6 +3,7 @@ interface PropsType { } export default function Account({ children }: PropsType) { + // document.querySelector("body")!.style.backgroundColor = "#f5f5f5"; return (
diff --git a/src/app/globals.css b/src/app/globals.css index e88d38a..dccc27e 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -8,7 +8,7 @@ } .skeltonUi { @apply bg-[#f7f7f7] relative; - } + } .drag { -webkit-user-select: text; -moz-user-select: text; @@ -39,12 +39,6 @@ html { user-select: none; } -body { - min-height: 100vh; - margin: auto; - padding: 68px 0; -} - a { color: black; text-decoration: none; @@ -59,7 +53,6 @@ input[type="number"]::-webkit-inner-spin-button { -webkit-appearance: none; } - table { width: 100%; border: none; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 26836da..6358b04 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -18,7 +18,12 @@ export default function RootLayout({ return ( - +
{children} From 8c522462ff2459b9b40bedcbb41a704b06242e5b Mon Sep 17 00:00:00 2001 From: KANGYONGSU23 Date: Tue, 12 Dec 2023 22:36:07 +0900 Subject: [PATCH 2/3] =?UTF-8?q?design=20::=20=EB=A1=9C=EA=B7=B8=EC=9D=B8/?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85/=EC=A7=80=EC=9B=90?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89=20=EB=B0=94=EA=BE=B8=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/account/layout.tsx | 1 - src/components/common/Header.tsx | 18 ++++++++++++++---- .../recruitments/apply/ShadowBox.tsx | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app/account/layout.tsx b/src/app/account/layout.tsx index 3e30fe6..cae8dbd 100644 --- a/src/app/account/layout.tsx +++ b/src/app/account/layout.tsx @@ -3,7 +3,6 @@ interface PropsType { } export default function Account({ children }: PropsType) { - // document.querySelector("body")!.style.backgroundColor = "#f5f5f5"; return (
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx index 2547886..6a8852e 100644 --- a/src/components/common/Header.tsx +++ b/src/components/common/Header.tsx @@ -1,6 +1,6 @@ "use client"; -import React from "react"; +import React, { useEffect } from "react"; import Image from "next/image"; import Logo from "@public/Logo.png"; import { Icon } from "@team-return/design-system"; @@ -10,7 +10,19 @@ import { useMyProfile } from "@/apis/students"; function Header() { const pathname = usePathname(); + useEffect(() => { + if ( + pathname.toString().indexOf("/apply") !== -1 || + pathname.toString().indexOf("/account") !== -1 + ) { + document.body.style.backgroundColor = "#fafafa"; + } else { + document.body.style.backgroundColor = "#ffffff"; + } + }, []); + if (pathname.toString().indexOf("/account") !== -1) { + document.querySelector("body")!.style.backgroundColor = "#f5f5f5"; return null; } @@ -73,9 +85,7 @@ function Header() { {profile?.student_name}

-
- {/* */} -
+
{/* */}
); diff --git a/src/components/recruitments/apply/ShadowBox.tsx b/src/components/recruitments/apply/ShadowBox.tsx index fdef8b8..b88d221 100644 --- a/src/components/recruitments/apply/ShadowBox.tsx +++ b/src/components/recruitments/apply/ShadowBox.tsx @@ -9,7 +9,7 @@ interface PropsType { export default function ShadowBox({ children, width, height }: PropsType) { return (
{children} From a315e82cde9708befcf467293730dd51e943aafa Mon Sep 17 00:00:00 2001 From: KANGYONGSU23 Date: Tue, 12 Dec 2023 22:44:38 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20::=20=EB=B9=8C=EB=93=9C=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Header.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx index 6a8852e..6b90a08 100644 --- a/src/components/common/Header.tsx +++ b/src/components/common/Header.tsx @@ -15,14 +15,13 @@ function Header() { pathname.toString().indexOf("/apply") !== -1 || pathname.toString().indexOf("/account") !== -1 ) { - document.body.style.backgroundColor = "#fafafa"; + document.querySelector("body")!.style.backgroundColor = "#fafafa"; } else { - document.body.style.backgroundColor = "#ffffff"; + document.querySelector("body")!.style.backgroundColor = "#ffffff"; } }, []); if (pathname.toString().indexOf("/account") !== -1) { - document.querySelector("body")!.style.backgroundColor = "#f5f5f5"; return null; }