Fixed the height occupying issue in the html tag.

langaracpsc · Dec 28, 2023 · d78407d · d78407d
1 parent e1e68d1
commit d78407d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/frontend/src/app/HomePage.tsx b/frontend/src/app/HomePage.tsx
@@ -52,8 +52,8 @@ export default function HomePage({} : HomePageProps)
     <div className={"text-2xl"}></div>;
     <div className={"flex-col-reverse"}></div>;
 
-    return <div className={"flex flex-row max-[600px]:flex-col-reverse bg-body-gray w-full h-full"}>
-        <div className={"grid grid-rows-[15%_60%_20%] max-[600px]:grid-rows-[5%_60%_20%] max-[600px]:grid-rows-1 w-full h-full gap-3"}>
+    return (<div className={"flex flex-row max-[600px]:flex-col-reverse bg-body-gray w-full h-full"}>
+        <div className={"grid grid-rows-[15%_60%_20%] max-[600px]:grid-rows-[5%_60%_20%] w-full h-full gap-3"}>
             <div></div>
 
             <div className={"flex flex-row row-start-2 flex-col row-span-1 text-7xl max-[850px]:text-4xl max-[600px]:text-3xl text-white-900 justify-center"}>
@@ -83,5 +83,6 @@ export default function HomePage({} : HomePageProps)
             {/* {(this.state.Dimensions.X < 600) ? null : <div className={"text-7xl max-[600px]:invisible"}></div>} */}
         </div>
     </div>
+    );
 }
 
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -4,7 +4,7 @@ import { Inter } from 'next/font/google'
 const inter = Inter({ subsets: ['latin'] })
 
 export const metadata = {
-  title: "langaracpscclub",
+  title: "Langara Computer Science Club",
   description: "Website for Langara Computer Science Club.",
 }
 
@@ -15,7 +15,7 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
-    <body className={inter.className}>{children}</body>
+      <body className={inter.className}>{children}</body>
     </html>
   )
 }
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -13,16 +13,15 @@ import { store } from './stores/store';
 
 
 export default function Home() {
-
     return (
         <Provider store={store}>
-        <main className="grid grid-rows-[10vh_1fr] max-[600px]:grid-rows-[10vh_1fr] overflow-hidden">
+        <main className="grid grid-rows-[10vh_1fr]  h-full w-full overflow-hidden">
             <NavBar Pages={new Map<string, string>([
                 ["Home", "/"],
                 ["About", "/about"],
                 ["Events", "/events"]
             ])}/>
-            <HomePage></HomePage>
+            <HomePage/>
         </main>
         </Provider>
     );

diff --git a/frontend/styles/globals.css b/frontend/styles/globals.css
@@ -20,7 +20,13 @@
   }
 }
 
+html {
+  height: 100%;
+}
+
 body {
+  margin: 0;
+  height: 100%;
   color: rgb(var(--foreground-rgb));
   background: linear-gradient(
       to bottom,