Merge branch 'main' into gene-expression

weng-lab · Jul 25, 2023 · be2b9b6 · be2b9b6
2 parents 24897f5 + 5596eaf
commit be2b9b6
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 262 deletions.
diff --git a/screen2.0/src/app/globals.css b/screen2.0/src/app/globals.css
@@ -390,9 +390,9 @@ template {
   min-height: 100vh;
 }
 
-/* Leaves exactly enough space on the bottom of the page for the footer */
+/* Leaves exactly enough space on the bottom of the page for the footer + 2rem */
 #content-wrapper {
-  padding-bottom: 4rem;
+  padding-bottom: 6rem;
 }
 
 /* Limit the amount of space the content can take up so it doesn't run into edge */

diff --git a/screen2.0/src/common/components/Footer.tsx b/screen2.0/src/common/components/Footer.tsx
@@ -5,7 +5,6 @@ import MuiLink from "@mui/material/Link"
 
 export default function Footer() {
   return (
-    //This positioning needs to change. Need it to be attached to bottom by scroll. Not attached by attaching to bottom of viewport
     <Box id="Footer" sx={{ position: "absolute", bottom: "0", textAlign: "center", width: "100%", height: "4rem" }}>
       <Typography variant="body2" color="text.secondary">
         {"Copyright © "}