From fcc0e0ccb6580930ffd0c9c52da704bb8dd44e4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 19:58:04 -0800
Subject: [PATCH] Cleans up formatting on about page

---
 bookwyrm/templates/about.html             | 16 --------------
 bookwyrm/templates/discover/about.html    | 22 ++++++++++++++++++
 bookwyrm/templates/discover/discover.html | 27 ++---------------------
 bookwyrm/templates/discover/icons.html    | 21 ++++++++++++++++++
 bookwyrm/views/landing.py                 |  2 +-
 5 files changed, 46 insertions(+), 42 deletions(-)
 delete mode 100644 bookwyrm/templates/about.html
 create mode 100644 bookwyrm/templates/discover/about.html
 create mode 100644 bookwyrm/templates/discover/icons.html

diff --git a/bookwyrm/templates/about.html b/bookwyrm/templates/about.html
deleted file mode 100644
index aa7426cad..000000000
--- a/bookwyrm/templates/about.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'layout.html' %}
-{% block content %}
-
-<div class="columns">
-    <div class="column block">
-        {% include 'snippets/about.html' %}
-    </div>
-
-    <div class="column block">
-        <h2 class="title">Code of Conduct</h2>
-        <div class="content">
-            {{ site.code_of_conduct | safe }}
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
new file mode 100644
index 000000000..091158070
--- /dev/null
+++ b/bookwyrm/templates/discover/about.html
@@ -0,0 +1,22 @@
+{% extends 'layout.html' %}
+{% block content %}
+
+<header class="block has-text-centered">
+    <h1 class="title">{{ site.name }}</h1>
+    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
+</header>
+
+{% include 'discover/icons.html' %}
+
+<section class="block">
+    {% include 'snippets/about.html' %}
+</section>
+
+<div class="block">
+    <h2 class="title">Code of Conduct</h2>
+    <div class="content">
+        {{ site.code_of_conduct | safe }}
+    </div>
+</div>
+
+{% endblock %}
diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 0b6f8a1f6..5a808bf7d 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -1,33 +1,14 @@
 {% extends 'layout.html' %}
 {% block content %}
 
-{% if not request.user.is_authenticated %}
 <header class="block has-text-centered">
     <h1 class="title">{{ site.name }}</h1>
     <h2 class="subtitle">{{ site.instance_tagline }}</h2>
 </header>
 
-<section class="level is-mobile">
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
-            <p class="heading">Decentralized</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
-            <p class="heading">Friendly</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
-            <p class="heading">Anti-Corporate</p>
-        </div>
-    </div>
-</section>
+{% include 'discover/icons.html' %}
 
+{% if not request.user.is_authenticated %}
 <section class="tile is-ancestor">
     <div class="tile is-7 is-parent">
         <div class="tile is-child box">
@@ -49,10 +30,6 @@
     </div>
 </section>
 
-{% else %}
-<div class="block">
-    <h1 class="title has-text-centered">Discover</h1>
-</div>
 {% endif %}
 
 <div class="block is-hidden-tablet">
diff --git a/bookwyrm/templates/discover/icons.html b/bookwyrm/templates/discover/icons.html
new file mode 100644
index 000000000..a40862824
--- /dev/null
+++ b/bookwyrm/templates/discover/icons.html
@@ -0,0 +1,21 @@
+<section class="level is-mobile">
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
+            <p class="heading">Decentralized</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
+            <p class="heading">Friendly</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
+            <p class="heading">Anti-Corporate</p>
+        </div>
+    </div>
+</section>
+
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 854f3a9b5..3be3eb312 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -16,7 +16,7 @@ class About(View):
         data = {
             'title': 'About',
         }
-        return TemplateResponse(request, 'about.html', data)
+        return TemplateResponse(request, 'discover/about.html', data)
 
 class Home(View):
     ''' discover page or home feed depending on auth '''