Skip to content

Commit

Permalink
Merge pull request #33 from New-Syatte/design-patch-#22
Browse files Browse the repository at this point in the history
Design patch #22
  • Loading branch information
ruddnjs3769 authored Apr 24, 2024
2 parents d13f8ef + 67edb62 commit c123480
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/(education)/education/EducationSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const EducationSlider = () => {
};

return (
<div className="w-full h-full flex justify-center items-center">
<div className="w-full h-full flex justify-center items-center overflow-hidden">
<div className="w-[1163px] h-full edu-slick">
<Slider {...settings}>
{slideData.map(slide => (
Expand Down
2 changes: 1 addition & 1 deletion src/app/(education)/education/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default async function Page() {
<TopBanner />
<div
className={
"flex flex-col justify-center items-center pt-24 pb-44 bg-bgGray"
"w-full h-[1140px] flex flex-col justify-center items-center pt-24 bg-bgGray"
}
>
<span
Expand Down
8 changes: 5 additions & 3 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,12 @@

html {
font-size: 16px;
overflow-x: hidden;
}

body {
font-family: var(--font-family);
position: relative;
overflow-x: hidden;
overflow-y: auto;
}

a {
Expand All @@ -107,5 +106,8 @@ a {

.edu-slick .slick-list {
overflow: visible;
touch-action: none;
}

.edu-slick .slick-track {
touch-action: pan-y;
}
9 changes: 9 additions & 0 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { EB_Garamond, Crimson_Pro, Noto_Sans_KR } from "next/font/google";
import Footer from "@/layouts/footer/Footer";
import Providers from "./Providers";
import Header from "@/layouts/header/Header";
import Head from "next/head";

export const garamond = EB_Garamond({
subsets: ["latin"],
Expand Down Expand Up @@ -41,6 +42,14 @@ export default async function RootLayout({ children }: RootLayoutProps) {
lang="ko"
className={`${garamond.variable} ${crimson.variable} ${notoSansKR.variable}`}
>
<Head>
<title>{metadata.title}</title>
<meta name="description" content={metadata.description} />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1, minimum-scale=1"
/>
</Head>
<body>
<Providers>
{/* @ts-expect-error Async Server Component */}
Expand Down

0 comments on commit c123480

Please sign in to comment.