From 03ce1b8475c21b7afea8b41c3c7f70665e7cf484 Mon Sep 17 00:00:00 2001
From: Dorian Wood <dorian@threeraccoons.com>
Date: Tue, 23 Jul 2024 12:28:34 -0400
Subject: [PATCH] final commit before launching the css strip

---
 Pipfile                        |  1 +
 brutaldon/templates/about.html |  7 ++-
 brutaldon/templates/base.html  | 82 ++++++++++++++++------------------
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/Pipfile b/Pipfile
index da0d5c0..5f57881 100644
--- a/Pipfile
+++ b/Pipfile
@@ -27,5 +27,6 @@ inscriptis = "*"
 lxml = "*"
 uwsgi = "*"
 django-debug-toolbar = "*"
+gunicorn = "*"
 
 [dev-packages]
diff --git a/brutaldon/templates/about.html b/brutaldon/templates/about.html
index 0878b25..3c1a21d 100644
--- a/brutaldon/templates/about.html
+++ b/brutaldon/templates/about.html
@@ -11,10 +11,13 @@
     <p>a brutalist web interface for Mastodon</p>
     <section>
         <p>
-            Brutaldon is a client for <a href="https://joinmastodon.org/">Mastodon</a>. You can use it to log in to any Mastodon instance from any browser, including text browsers such as lynx.
+            Brutaldon is a client for <a href="https://joinmastodon.org/">Mastodon</a>.
+            You can use it to log in to any Mastodon instance from any browser,
+            including text browsers such as lynx.
         </p>
         <p>
-            You do not need a separate brutaldon account to use it. Brutaldon will authenticate you to your instance.
+            You do not need a separate brutaldon account to use it.
+            Brutaldon will authenticate you to your instance.
         </p>
     </section>
 
diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index dfcebd1..6b9f070 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -14,51 +14,45 @@
                     brutaldon
                 {% endif %}
             {% endblock %}</title>
-            <link rel="manifest" href="{% static 'manifest.webmanifest' %}">
-            {% if own_acct %}
-                <link rel="icon" href="{{ own_acct.avatar_static }}">
-            {% else %}
-                <link rel="icon" href="{% static "images/brutaldon.png" %}" type="image/png">
+        <link rel="manifest" href="{% static 'manifest.webmanifest' %}">
+        {% if own_acct %}
+          <link rel="icon" href="{{ own_acct.avatar_static }}">
+          {% else %}
+          <link rel="icon" href="{% static "images/brutaldon.png" %}" type="image/png">
+        {% endif %}
+
+        <meta name="twitter:card" content="summary">
+        <meta property="og:type" content="website">
+        <meta name="twitter:url" property="og:url" content="{% url "about" %}">
+        <meta name="twitter:title" property="og:title" content="Brutaldon">
+        <meta name="twitter:image" property="og:image"
+              content="{% static "images/brutaldon.png" %}">
+        <meta name="twitter:description" property="og:description"
+              content="A brutalist, web-1.0 web client for Mastodon and Pleroma. Supports text-only browsers like Lynx, older browsers, as well as the latest mainstream browsers. All JavaScript is completely optional and progressively enhances the core application.">
+        <!-- Minified version -->
+        <link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
+        <link rel="stylesheet" href="{% static 'css/brutal-css.css' %}">
+        {% if not preferences %}
+            <link rel="stylesheet"
+                  href="{% static 'css/magnific-popup.css' %}">
+            <link rel="stylesheet" href="{% static "css/brutaldon.css" %}">
+        {% else  %}
+            <link rel="stylesheet"
+                  href="{% static preferences.theme.main_css %}">
+            <link rel="stylesheet" href="{% static preferences.theme.tweaks_css %}">
+            <link rel="stylesheet"
+                  href="{% static 'css/magnific-popup.css' %}">
+            {% if not preferences.no_javascript %}
+                <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
+                <script type="text/javascript" src="{% static 'js/intercooler.js' %}"></script>
+                <script type="application/javascript" src="{% static 'js/mousetrap.min.js' %}"></script>
+                <script type="text/javascript" src="{% static 'js/jquery.magnific-popup.min.js' %}"></script>
+                <script type="text/javascript" src="{% static 'js/loading-attribute-polyfill.min.js' %}"></script>
+                <script type="text/javascript" src="{% static 'js/brutaldon-enhancements.js' %}"></script>
+                {% block page_scripts %}
+                {% endblock %}
             {% endif %}
-
-            <meta name="twitter:card" content="summary">
-            <meta property="og:type" content="website">
-            <meta name="twitter:url" property="og:url" content="{% url "about" %}">
-            <meta name="twitter:title" property="og:title" content="Brutaldon">
-            <meta name="twitter:image" property="og:image"
-                  content="{% static "images/brutaldon.png" %}">
-            <meta name="twitter:description" property="og:description"
-                  content="A brutalist, web-1.0 web client for Mastodon and Pleroma. Supports text-only browsers like Lynx, older browsers, as well as the latest mainstream browsers. All JavaScript is completely optional and progressively enhances the core application.">
-<!-- Minified version -->
-<link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
-<link rel="stylesheet" href="{% static 'css/brutal-css.css' %}">
-{% if not preferences %}
-                <link rel="stylesheet"
-                      href="{% static 'css/magnific-popup.css' %}">
-                <link rel="stylesheet" href="{% static "css/brutaldon.css" %}">
-            {% else  %}
-                <link rel="stylesheet"
-                      href="{% static preferences.theme.main_css %}">
-                <link rel="stylesheet" href="{% static preferences.theme.tweaks_css %}">
-                <link rel="stylesheet"
-                      href="{% static 'css/magnific-popup.css' %}">
-                {% if not preferences.theme.is_brutalist %}
-                {% endif %}
-                {% if not preferences.no_javascript %}
-                    <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
-                    <script type="text/javascript" src="{% static 'js/intercooler.js' %}"></script>
-                    <script type="application/javascript" src="{% static 'js/mousetrap.min.js' %}"></script>
-                    <script type="text/javascript" src="{% static 'js/jquery.magnific-popup.min.js' %}"></script>
-                    <script type="text/javascript" src="{% static 'js/loading-attribute-polyfill.min.js' %}"></script>
-                    <script type="text/javascript" src="{% static 'js/brutaldon-enhancements.js' %}"></script>
-                    {% block page_scripts %}
-                    {% endblock %}
-                {% endif %}
-            {% endif %}
-
-
-
-
+        {% endif %}
     </head>
     <body ic-global-include='{"csrfmiddlewaretoken": "{{ csrf_token }}"}'>
         <div id="page-load-indicator"></div>