Address Sean's comments

acmucsd · Dec 10, 2024 · 4825d96 · 4825d96
1 parent 44d3d53
commit 4825d96
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 781 deletions.
diff --git a/public/assets/diamond-pile-left.png b/public/assets/diamond-pile-left.png
diff --git a/public/assets/diamond-pile-left.svg b/public/assets/diamond-pile-left.svg
diff --git a/public/assets/diamond-pile-right.png b/public/assets/diamond-pile-right.png
diff --git a/public/assets/diamond-pile-right.svg b/public/assets/diamond-pile-right.svg
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -13,10 +13,10 @@ export const metadata: Metadata = {
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
-      <body className={dmSans.className}>{children}</body>
-      <footer className={dmSans.className}>
+      <body className={dmSans.className}>
+        {children}
         <Footer />
-      </footer>
+      </body>
     </html>
   );
 }
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -5,14 +5,14 @@ import Image from 'next/image';
 import Instagram from '../../../public/assets/instagram.svg';
 import Discord from '../../../public/assets/discord.svg';
 import Facebook from '../../../public/assets/facebook.svg';
-import DiamondPileLeft from '../../../public/assets/diamond-pile-left.svg';
-import DiamondPileRight from '../../../public/assets/diamond-pile-right.svg';
+import DiamondPileLeft from '../../../public/assets/diamond-pile-left.png';
+import DiamondPileRight from '../../../public/assets/diamond-pile-right.png';
 
 const Footer: React.FC = () => {
   return (
     <div className={styles.container}>
-      <DiamondPileLeft className={styles.backgroundLeft} />
-      <DiamondPileRight className={styles.backgroundRight} />
+      <Image src={DiamondPileLeft} alt="Pile of diamonds" className={styles.backgroundLeft} />
+      <Image src={DiamondPileRight} alt="Pile of diamonds" className={styles.backgroundRight} />
       <div className={styles.links}>
         <Link href="https://acmucsd.com/about">
           <Typography variant="body/large">About Us</Typography>

diff --git a/src/components/Footer/style.module.scss b/src/components/Footer/style.module.scss
@@ -8,6 +8,7 @@
   align-items: center;
   padding: 8rem vars.$side-padding;
   position: relative;
+  margin: 0 calc(vars.$side-padding * -1);
 
   text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.7);
 }
@@ -17,13 +18,19 @@
   left: 0;
   bottom: 0;
   z-index: -1;
+  max-width: min(100%, 580px);
+  height: auto;
+  object-fit: contain;
 }
 
 .backgroundRight {
   position: absolute;
   right: 0;
   bottom: 0;
   z-index: -1;
+  max-width: min(100%, 850px);
+  height: auto;
+  object-fit: contain;
 }
 
 .links {

diff --git a/src/styles/globals.scss b/src/styles/globals.scss
@@ -1,8 +1,7 @@
 @use './vars.scss' as vars;
 
 html,
-body,
-footer {
+body {
   color: vars.$white;
   margin: 0;
   padding: 0;