From 9b773d7ce2d0474e43d111240b1e8b9183311c7f Mon Sep 17 00:00:00 2001
From: Devin Haska <wonderfulfrog@users.noreply.github.com>
Date: Sun, 4 Feb 2024 10:53:11 -0800
Subject: [PATCH] fix: clean up html/njk formatting

---
 src/_includes/partials/footer.html |  4 +-
 src/_includes/partials/header.html |  4 +-
 src/_includes/partials/menu.html   | 26 ++++--------
 src/_layouts/base.html             | 66 ++++++++++++++----------------
 src/_layouts/post.html             |  6 +--
 5 files changed, 45 insertions(+), 61 deletions(-)
diff --git a/src/_includes/partials/footer.html b/src/_includes/partials/footer.html
index b39ed1f..a45e63a 100644
--- a/src/_includes/partials/footer.html
+++ b/src/_includes/partials/footer.html
@@ -1 +1,3 @@
-<footer>Footer.</footer>
+<footer>
+    Footer.
+</footer>
diff --git a/src/_includes/partials/header.html b/src/_includes/partials/header.html
index 8116894..915f04f 100644
--- a/src/_includes/partials/header.html
+++ b/src/_includes/partials/header.html
@@ -1 +1,3 @@
-<header>{% include "partials/menu.html" %}</header>
+<header>
+    {% include "partials/menu.html" %}
+</header>
diff --git a/src/_includes/partials/menu.html b/src/_includes/partials/menu.html
index 6281e1b..52d124e 100644
--- a/src/_includes/partials/menu.html
+++ b/src/_includes/partials/menu.html
@@ -1,20 +1,10 @@
 <nav aria-label="Main">
-  Menu.
-  <ul>
-    {% for item in navigation.top %}
-    <li>
-      <a
-        class="nav"
-        href="{{ item.url }}"
-        {{
-        helpers.getLinkActiveState(item.url,
-        page.url)
-        |
-        safe
-        }}
-        >{{ item.text }}</a
-      >
-    </li>
-    {% endfor %}
-  </ul>
+    Menu.
+    <ul>
+        {% for item in navigation.top %}
+            <li>
+                <a class="nav" href="{{ item.url }}" {{ helpers.getLinkActiveState(item.url, page.url) | safe }}>{{ item.text }}</a>
+            </li>
+        {% endfor %}
+    </ul>
 </nav>
diff --git a/src/_layouts/base.html b/src/_layouts/base.html
index 718a81d..4e9c236 100644
--- a/src/_layouts/base.html
+++ b/src/_layouts/base.html
@@ -1,38 +1,32 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-  <head>
-    <!-- charset/http-equiv/viewport -->
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-    <link rel="stylesheet" href="/assets/css/global.css" />
-    {% for preload in preloads %}
-    <link
-      rel="preload"
-      as="{{ preload.as }}"
-      href="{{ preload.href }}"
-      {%
-      if
-      preload.crossorigin
-      %}crossorigin{%
-      endif
-      %}
-    />
-    {% endfor %} {% set fontCss %} {% include "css/fontFace.njk" %} {% include
-    "css/fontVariables.njk" %}{% endset %}
-    <style>
-      {{ fontCss | minifyCss | safe }}
-    </style>
-    {% set colorCss %} {% include "css/colorVariables.njk" %} {% endset %}
-    <style>
-      {{ colorCss | minifyCss | safe }}
-    </style>
-  </head>
-
-  <body>
-    {% include "partials/header.html" %}
-    <main id="main" class="wrapper flow">{{ content | safe }}</main>
-    {% include "partials/footer.html" %}
-  </body>
+    <head>
+        <!-- charset/http-equiv/viewport -->
+        <meta charset="UTF-8" />
+        <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link rel="stylesheet" href="/assets/css/global.css" />
+        {% for preload in preloads %}
+            <link rel="preload"
+                  as="{{ preload.as }}"
+                  href="{{ preload.href }}"
+                  {% if preload.crossorigin %}crossorigin{% endif %} />
+        {% endfor %}
+        {% set fontCss %}
+            {% include "css/fontFace.njk" %}
+            {% include "css/fontVariables.njk" %}
+        {% endset %}
+        <style>{{ fontCss | minifyCss | safe }}</style>
+        {% set colorCss %}
+            {% include "css/colorVariables.njk" %}
+        {% endset %}
+        <style>{{ colorCss | minifyCss | safe }}</style>
+    </head>
+    <body>
+        {% include "partials/header.html" %}
+        <main id="main" class="wrapper flow">
+            {{ content | safe }}
+        </main>
+        {% include "partials/footer.html" %}
+    </body>
 </html>
diff --git a/src/_layouts/post.html b/src/_layouts/post.html
index 4bc1565..3b7978e 100644
--- a/src/_layouts/post.html
+++ b/src/_layouts/post.html
@@ -3,12 +3,8 @@ layout: base
 ---
 
 <p>{{ date }}</p>
-
 <h1>{{ title }}</h1>
-
 <ul>
-  {% for category in categories %}
-  <li>#{{ category }}</li>
-  {% endfor %}
+    {% for category in categories %}<li>#{{ category }}</li>{% endfor %}
 </ul>
 {{ content | safe }}
