From 29596e9c652f8d9828d30878cecadd49f4e23013 Mon Sep 17 00:00:00 2001
From: Robin King <robin2.king@live.uwe.ac.uk>
Date: Mon, 20 Mar 2023 22:04:07 +0000
Subject: [PATCH] feat(*.html-styles.css): complete footer

---
 about.html    |  8 ++---
 index.html    | 16 ++++-----
 location.html |  8 ++---
 rules.html    |  8 ++---
 styles.css    | 98 ++++++++++++++++++++++++++++++++++++++++++---------
 5 files changed, 99 insertions(+), 39 deletions(-)

diff --git a/about.html b/about.html
index 6f8501a..4c88722 100644
--- a/about.html
+++ b/about.html
@@ -10,7 +10,7 @@
     <title>Create Against Hate</title>
 </head>
 
-<body>
+<body id="about">
     <header id="main-navigation">
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
@@ -56,13 +56,13 @@
         <!-- Copyright -->
         <p><i>Create Against Hate</i> &copy; Robin King 2022</p>
         <!-- Sitemap -->
-        <nav id="sitemap" class="navbar" aria-labelledby="Create Against Hate Sitemap">
+        <nav id="sitemap" class="navbar" aria-label="Create Against Hate Sitemap">
             <ul role="menubar">
                 <li role="none">
-                    <a href="#" role="menuitem">Home</span></a>
+                    <a href="index.html" role="menuitem">Home</span></a>
                 </li>
                 <li role="none">
-                    <a href="about.html" role="menuitem">About <i>Stop Hate UK</i></a>
+                    <a href="#" role="menuitem" aria-current="page">About <i>Stop Hate UK</i></a>
                 </li>
                 <li role="none">
                     <a href="rules.html" role="menuitem">Jam Rules</span></a>
diff --git a/index.html b/index.html
index 5b9017c..0966405 100644
--- a/index.html
+++ b/index.html
@@ -68,12 +68,10 @@
         <section id="home__about">
             <h2>About the Jam</h2>
             <article class="grid-2x2">
-                <div>
-                    <img src="assets\img\placeholder-sketches\gaming.jpg" alt="Drawing of two characters playing a video game and having a good time">
-                </div>
+                <img src="assets\img\placeholder-sketches\gaming.jpg" alt="Drawing of two characters playing a video game and having a good time">
                 <div>
                     <p>
-                        <i>Create Against Hate</i> is a manga-themed charity game jam in support of <a href="https://www.stophateuk.org/" target="_blank" rel="noopener"><i>Stop Hate UK</i></a>. <i>Stop Hate UK</i> is a UK-based charity dedicated to the prevention of hate crimes and to support the victims of hate-based discrimination. <a href="about.html">Find out more</a>.
+                        <i>Create Against Hate</i> is a manga-themed charity game jam created in support of <a href="https://www.stophateuk.org/" target="_blank" rel="noopener"><i>Stop Hate UK</i></a>. <i>Stop Hate UK</i> is a UK-based charity dedicated to the prevention of hate crimes and to support the victims of hate-based discrimination. <a href="about.html">Find out more &rarr;</a>
                     </p>
                     <p>
                         In particular, hate crimes against East and South East Asian communities have increased as a result of the COVID-19 pandemic, with reports rising 50% over two years, prompting the creation of the <a href="https://www.stophateuk.org/on-your-side-report-and-support-service/" target="_blank" rel="noopener"><i>On Your Side: Support and Report Service</i></a>, which <i>Stop Hate UK</i> helps lead.
@@ -81,15 +79,13 @@
                 </div>
                 <div>
                     <p>
-                        Manga is a worldwide phenomenon originating in Japan, inspiring a large variety of video games and bringing fans together across the world, which is why it's been chosen as the theme of this jam dedicated to combatting hate. <a href="rules.html">Click here for rules and ideas</a>.
+                        Manga is a worldwide phenomenon originating in Japan, inspiring a large variety of video games and bringing fans together across the world, which is why it's been chosen as the theme of this jam dedicated to combatting hate. <a href="rules.html">Click here for rules and ideas &rarr;</a>
                     </p>
                     <p>
                         All games created during the jam will be available for free with the option to donate to <i>Stop Hate UK</i> at checkout.
                     </p>
                 </div>
-                <div>
-                    <img src="assets\img\placeholder-sketches\donations.jpg" alt="Drawing of a group of characters gathering donations for 'Stop Hate UK'">
-                </div>
+                <img src="assets\img\placeholder-sketches\donations.jpg" alt="Drawing of a group of characters gathering donations for 'Stop Hate UK'">
             </article>
         </section>
         <!-- Sign Up Form -->
@@ -140,10 +136,10 @@
         <!-- Copyright -->
         <p><i>Create Against Hate</i> &copy; Robin King 2022</p>
         <!-- Sitemap -->
-        <nav id="sitemap" class="navbar" aria-labelledby="Create Against Hate Sitemap">
+        <nav id="sitemap" class="navbar" aria-label="Create Against Hate Sitemap">
             <ul role="menubar">
                 <li role="none">
-                    <a href="#" role="menuitem">Home</span></a>
+                    <a href="#" role="menuitem" aria-current="page">Home</span></a>
                 </li>
                 <li role="none">
                     <a href="about.html" role="menuitem">About <i>Stop Hate UK</i></a>
diff --git a/location.html b/location.html
index c6ff3f9..e740f2b 100644
--- a/location.html
+++ b/location.html
@@ -10,7 +10,7 @@
     <title>Create Against Hate</title>
 </head>
 
-<body>
+<body id="location">
     <header id="main-navigation">
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
@@ -57,10 +57,10 @@
         <!-- Copyright -->
         <p><i>Create Against Hate</i> &copy; Robin King 2022</p>
         <!-- Sitemap -->
-        <nav id="sitemap" class="navbar" aria-labelledby="Create Against Hate Sitemap">
+        <nav id="sitemap" class="navbar" aria-label="Create Against Hate Sitemap">
             <ul role="menubar">
                 <li role="none">
-                    <a href="#" role="menuitem">Home</span></a>
+                    <a href="index.html" role="menuitem">Home</span></a>
                 </li>
                 <li role="none">
                     <a href="about.html" role="menuitem">About <i>Stop Hate UK</i></a>
@@ -69,7 +69,7 @@
                     <a href="rules.html" role="menuitem">Jam Rules</span></a>
                 </li>
                 <li role="none">
-                    <a href="location.html" role="menuitem">How to find us</a>
+                    <a href="#" role="menuitem" aria-current="page">How to find us</a>
                 </li>
             </ul>
         </nav>
diff --git a/rules.html b/rules.html
index c508ee8..e9c6279 100644
--- a/rules.html
+++ b/rules.html
@@ -10,7 +10,7 @@
     <title>Create Against Hate</title>
 </head>
 
-<body>
+<body id="rules">
     <header id="main-navigation">
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
@@ -57,16 +57,16 @@
         <!-- Copyright -->
         <p><i>Create Against Hate</i> &copy; Robin King 2022</p>
         <!-- Sitemap -->
-        <nav id="sitemap" class="navbar" aria-labelledby="Create Against Hate Sitemap">
+        <nav id="sitemap" class="navbar" aria-label="Create Against Hate Sitemap">
             <ul role="menubar">
                 <li role="none">
-                    <a href="#" role="menuitem">Home</span></a>
+                    <a href="index.html" role="menuitem">Home</span></a>
                 </li>
                 <li role="none">
                     <a href="about.html" role="menuitem">About <i>Stop Hate UK</i></a>
                 </li>
                 <li role="none">
-                    <a href="rules.html" role="menuitem">Jam Rules</span></a>
+                    <a href="#" role="menuitem" aria-current="page">Jam Rules</span></a>
                 </li>
                 <li role="none">
                     <a href="location.html" role="menuitem">How to find us</a>
diff --git a/styles.css b/styles.css
index 9c82ed1..b156de7 100644
--- a/styles.css
+++ b/styles.css
@@ -228,13 +228,21 @@
 
                 display: inline-block;
 
-                margin-left: .5em;
+                margin-left: .2em;
 
                 height: .5em;
                 width: .5em;
 
                 transform: translateY(-50%);
             }
+
+        /* Remove any external link icons from btns and social icons in footer */
+            a[class|="btn"]::after, #socials a::after {
+                mask: none;
+                margin: 0;
+                height: 0;
+                width: 0;
+            }
         
             #home__about a[target="_blank"]::after, #locations__directions a[target="_blank"]::after {
                 background-color: var(--accent-baby-pink);
@@ -265,14 +273,6 @@
             font-size: 1rem;
         }
 
-        /* Remove any external link icons from btn */
-            a[class|="btn"]::after {
-                mask: none;
-                margin: 0;
-                height: 0;
-                width: 0;
-            }
-
     /** Main Site Buttons **/
 
         .btn--primary {
@@ -430,9 +430,9 @@
     }
 
     /** Toggleable class used to show and hide navbar **/
-    #main-navigation.show {
-        top: 0;
-    }
+        #main-navigation.show {
+            top: 0;
+        }
 
     /** Hamburger button for tablet **/
         .hamburger {
@@ -461,6 +461,41 @@
             box-shadow: 3px 5px 19px 0px rgba(0, 0, 0, .41);
         }
 
+/*** Footer Styles ***/
+    footer {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 1em;
+
+        color: white;
+    }
+
+    footer p {
+        margin: 0;
+    }
+
+    footer a {
+        text-decoration: underline;
+    }
+
+    footer a, footer a:visited {
+        color: white;
+    }
+
+    footer ul {
+        display: flex;
+        flex-wrap: wrap;
+    }
+
+    footer ul li {
+        margin-right: 1em;
+    }
+
+    footer ul li span[class|="icon"] {
+        margin: 0;
+    }
+
 /*** Homepage Styles ***/
     /** Hero Section **/
         #home .hero {
@@ -648,8 +683,10 @@
             display: grid;
             grid-template-columns: repeat(4, 1fr);
 
+            border-top: var(--main-dark) .1rem solid;
+
             width: 100vw;
-            height: calc(100vh/12);
+            height: 3rem;
 
             background-color: var(--footer-purple);
         }
@@ -660,6 +697,10 @@
             border-right: var(--main-dark) .1rem solid;
         }
 
+        #main-navigation .navbar li:last-of-type {
+            border-right: none;
+        }
+
         #main-navigation .navbar a {
             display: flex;
             justify-content: center;
@@ -680,10 +721,6 @@
                 transform: translateY(0);
         }
 
-        #main-navigation .navbar li:last-of-type {
-            border-right: none;
-        }
-
         /** Reset anchor tag styles in nav because the list background should be coloured instead **/
             #main-navigation .navbar a:hover,
             #main-navigation .navbar a[aria-current="page"] {
@@ -708,4 +745,31 @@
         .hamburger {
             display: none;
         }
+
+    /*** Footer Styles ***/
+        footer {
+            display: grid;
+            grid-template: repeat(2, auto) / repeat(2, 1fr);
+            gap: 0;
+
+            padding: 0;
+            /* Space for navbar */
+                padding-bottom: 3rem;
+        }
+
+        footer > * {
+            justify-content: flex-end;
+            padding: 2rem;
+        }
+
+        #sitemap {
+            grid-area: 1 / 1 / span 1 / span 2;
+            border-bottom: 0.2rem solid var(--main-dark);
+        }
+
+        #sitemap ul {
+            flex-direction: column;
+            align-items: center;
+            gap: 1em;
+        }
 }
\ No newline at end of file
-- 
GitLab