layout tweaks

jeffdc · Oct 6, 2023 · 6761771 · 6761771
1 parent 6aafeb5
commit 6761771
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/layouts/footer.tsx b/layouts/footer.tsx
@@ -19,9 +19,6 @@ const Footer = (): JSX.Element => {
 
     return (
         <Navbar expand="sm" variant="dark" collapseOnSelect className="navbar-footer container-fluid">
-            <Navbar.Toggle aria-controls="responsive-navbar-nav">
-                <i className="hamburger" />
-            </Navbar.Toggle>
             <Navbar.Collapse>
                 {mounted && session && (
                     <>
@@ -45,6 +42,9 @@ const Footer = (): JSX.Element => {
                     About
                 </Nav.Link>
             </Navbar.Collapse>
+            <Navbar.Toggle aria-controls="responsive-navbar-nav">
+                <i className="hamburger" />
+            </Navbar.Toggle>
         </Navbar>
     );
 };

diff --git a/layouts/header.tsx b/layouts/header.tsx
@@ -31,14 +31,12 @@ const Header = (): JSX.Element => {
                 <title>Gallformers</title>
                 <link rel="icon" href="/favicon.ico" />
             </Head>
-            <Navbar sticky="top" collapseOnSelect expand="md" className="navbar-custom" variant="dark" p-0 m-0>
+            <Navbar sticky="top" collapseOnSelect expand="md" className="navbar-custom p-0 m-0" variant="dark">
                 <Container fluid>
                     <Navbar.Brand href="/">
-                        {/* eslint-disable-next-line @next/next/no-img-element */}
                         <img
                             src="/branding/Wide Logo Versions/gallformers_logo_wide_color.png"
                             height="70px"
-                            // className="d-inline-block"
                             alt="The gallformers logo: an oak gall wasp with a spherical oak gall and a white oak leaf."
                         />
                     </Navbar.Brand>

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -35,7 +35,7 @@ function Gallformers({ Component, pageProps }: AppProps): JSX.Element {
                         </Col>
                     </Row>
                     <Row>
-                        <Col classNme="m-0 p-0">
+                        <Col className="m-2 p-2">
                             <ConfirmationServiceProvider>
                                 <Component {...pageProps} />
                             </ConfirmationServiceProvider>

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -21,7 +21,7 @@ function Home({ randomGall }: Props): JSX.Element {
             </Row>
             <Row className="text-center pb-3"></Row>
             <Row>
-                <Col>
+                <Col sm="12" md="7">
                     <Card>
                         <Card.Header>
                             <h2>What the heck is a gall?!</h2>
@@ -35,6 +35,32 @@ function Home({ randomGall }: Props): JSX.Element {
                         </Card.Body>
                     </Card>
                 </Col>
+                <Col>
+                    <Card>
+                        <Card.Header>
+                            <h2>Stuff you can do.</h2>
+                        </Card.Header>
+                        <Card.Body>
+                            <ul>
+                                <li>
+                                    <Link href="/id">
+                                        <a>Identify Galls</a>
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link href="/refindex">
+                                        <a>Learn More About Galls</a>
+                                    </Link>
+                                </li>
+                                <li>
+                                    <Link href="/explore">
+                                        <a>Explore the Data</a>
+                                    </Link>
+                                </li>
+                            </ul>
+                        </Card.Body>
+                    </Card>
+                </Col>
             </Row>
             <Row className="pb-4 pt-4">
                 <Col sm="12" md="6">

diff --git a/pages/style.scss b/pages/style.scss
@@ -45,6 +45,7 @@ $fa-font-path: "/fa/webfonts";
 
 body {
     font-family: "League Spartan", Helvetica, Arial, sans-serif;
+    font-size: large;
     color: gf-autumn;
 }
 

diff --git a/prisma/gallformers.sqlite b/prisma/gallformers.sqlite
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,7 @@ $fa-font-path: "/fa/webfonts"; @@
     body {
         font-family: "League Spartan", Helvetica, Arial, sans-serif;
+        font-size: large;
         color: gf-autumn;
     }
@@ Expand Down @@