fixed merge errors

TechAtNYU · Dec 2, 2024 · 4c67a9b · 4c67a9b
1 parent b2bd2e7
commit 4c67a9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -22,6 +22,10 @@ export default function RootLayout({
       <head>
         <meta name="description" content="Tech@NYU" />
         <link rel="icon" href="/favicon.ico" sizes="any" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1.0"
+        ></meta>
       </head>
       <body className={inter.className}>
         <ThemeProvider

diff --git a/app/page.tsx b/app/page.tsx
@@ -13,7 +13,7 @@ import Program_Banner from "@/components/Program_Banner";
 
 const Home = () => {
   return (
-    <main className="relative bg-black-100 flex justify-center items-center flex-colmx-auto sm:px-10 px-5 overflow-clip">
+    <main className="relative bg-black-100 flex justify-center items-center flex-col overflow-hidden mx-auto sm:px-10 px-5 w-full">
       <div className="max-w-7xl w-full">
         <FloatingNav navItems={navItems} />
         <Hero />