From 64df4ff17ce498d04044f427391cd96c8828ce8c Mon Sep 17 00:00:00 2001
From: Narlotl <luke@lukefretwell.com>
Date: Thu, 29 Feb 2024 10:33:22 -0800
Subject: [PATCH] Footer cleanup

---
 _config.yml            |  4 ++++
 _data/nav-footer-1.yml | 20 -----------------
 _data/nav-footer-2.yml | 12 ----------
 _data/nav-footer-3.yml | 17 --------------
 _data/nav-footer.yml   | 50 ++++++++++++++++++++++++++++++++++++++++++
 _includes/footer.html  | 50 +++++++++++++++---------------------------
 6 files changed, 72 insertions(+), 81 deletions(-)
 delete mode 100644 _data/nav-footer-1.yml
 delete mode 100644 _data/nav-footer-2.yml
 delete mode 100644 _data/nav-footer-3.yml
 create mode 100644 _data/nav-footer.yml

diff --git a/_config.yml b/_config.yml
index aba0864c..1bf1f5b1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,6 +4,10 @@ description: Public service in the digital age
 #baseurl: ""
 url: https://proudlyservingbook.com
 
+# Organization
+org-name: Proudly Serving
+org-url: https://proudlyservingbook.com
+
 # Social
 social:
   name: Proudly Serving
diff --git a/_data/nav-footer-1.yml b/_data/nav-footer-1.yml
deleted file mode 100644
index 813ae454..00000000
--- a/_data/nav-footer-1.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-docs_list_title: nav-footer-1
-docs:
-
- - title: About
-   url: /about/
-
- - title: What they're saying
-   url: /what-they're-saying/
-
- - title: People
-   url: /people/
-
- - title: News
-   url: /news/
-   
- - title: Connect
-   url: /connect/
-
- - title: Contact
-   url: /contact/
\ No newline at end of file
diff --git a/_data/nav-footer-2.yml b/_data/nav-footer-2.yml
deleted file mode 100644
index 7a8fbac3..00000000
--- a/_data/nav-footer-2.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-docs_list_title: nav-footer-2
-docs:
-
- - title: Contents
-   url: /contents/
-
- - title: Manuscript
-   url: /manuscript/
-
- - title: Feedback
-   url: /feedback/
-
diff --git a/_data/nav-footer-3.yml b/_data/nav-footer-3.yml
deleted file mode 100644
index 7e5c1c77..00000000
--- a/_data/nav-footer-3.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-docs_list_title: nav-footer-3
-docs:
-
- - title: Style guide
-   url: /style/
-
- - title: Code of conduct
-   url: /conduct/
-
- - title: Accessibility
-   url: /accessibility/
-
- - title: License
-   url: /license/
-
- - title: Colophon
-   url: /colophon/
diff --git a/_data/nav-footer.yml b/_data/nav-footer.yml
new file mode 100644
index 00000000..a0c807b8
--- /dev/null
+++ b/_data/nav-footer.yml
@@ -0,0 +1,50 @@
+docs_list_title: nav-footer
+docs:
+
+-
+
+ - title: About
+   url: /about/
+
+ - title: What they're saying
+   url: /what-they're-saying/
+
+ - title: People
+   url: /people/
+
+ - title: News
+   url: /news/
+   
+ - title: Connect
+   url: /connect/
+
+ - title: Contact
+   url: /contact/
+
+-
+
+ - title: Contents
+   url: /contents/
+
+ - title: Manuscript
+   url: /manuscript/
+
+ - title: Feedback
+   url: /feedback/
+
+-
+
+ - title: Style guide
+   url: /style/
+
+ - title: Code of conduct
+   url: /conduct/
+
+ - title: Accessibility
+   url: /accessibility/
+
+ - title: License
+   url: /license/
+
+ - title: Colophon
+   url: /colophon/
diff --git a/_includes/footer.html b/_includes/footer.html
index 05073548..06a2a119 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -2,7 +2,7 @@
   <div class="footer mt-5 py-5 bg-dark text-white">
     <div class="container">
       <div class="row">
-        <div class="col-12 col-sm-3 col-md-3 col-lg-3 col-xl-3">
+        <div class="col-12 col-sm-6 col-md-3 col-lg-3 col-xl-3">
           <a href="{{ site.baseurl }}/">
             <img
               src="{{ site.baseurl }}/assets/img/avatar.png"
@@ -10,40 +10,26 @@
               class="border sm mb-3">
           </a>
         </div>
-        <div class="col-12 col-sm-3 col-md-3 col-lg-3 col-xl-3">
-          <ul class="list-unstyled small">
-            {% for item in site.data.nav-footer-1.docs %}
-              {% if item.url %}
+        {% for col in site.data.nav-footer.docs %}
+          <div class="col-12 col-sm-6 col-md-3 col-lg-3 col-xl-3">
+            <ul class="nav flex-column">
+              {% for item in col %}
                 <li>
-                  <a href="{{ site.baseurl }}{{ item.url }}" class="text-white text-decoration-none">{{ item.title }}</a>
+                  <a href="{{ site.baseurl }}{{ item.url }}" class="nav-link p-0 text-white">{{ item.title }}</a>
                 </li>
-              {% endif %}
-            {% endfor %}
-          </ul>
-        </div>
-        <div class="col-12 col-sm-3 col-md-3 col-lg-3 col-xl-3">
-          <ul class="list-unstyled small">
-            {% for item in site.data.nav-footer-2.docs %}
-              {% if item.url %}
-                <li>
-                  <a href="{{ site.baseurl }}{{ item.url }}" class="text-white text-decoration-none">{{ item.title }}</a>
-                </li>
-              {% endif %}
-            {% endfor %}
-          </ul>
-        </div>
-        <div class="col-12 col-sm-3 col-md-3 col-lg-3 col-xl-3">
-          <ul class="list-unstyled small">
-            {% for item in site.data.nav-footer-3.docs %}
-              {% if item.url %}
-                <li>
-                  <a href="{{ site.baseurl }}{{ item.url }}" class="text-white text-decoration-none">{{ item.title }}</a>
-                </li>
-              {% endif %}
-            {% endfor %}
-          </ul>
-        </div>
+              {% endfor %}
+            </ul>
+          </div>
+        {% endfor %}
       </div>
+      {% if site.org-name %}
+        <div class="row mt-3">
+          <div class="col-12"></div>
+          <p>A
+            <a href="{{ site.org-url }}" class="text-white">{{ site.org-name }}</a>
+            project</p>
+        </div>
+      {% endif %}
     </div>
   </div>
 </footer>