Merge branch 'main' into production

bookwyrm/templates/about.html

@@ -3,16 +3,14 @@
 
 <div class="columns">
     <div class="column block">
-        <blockquote>
-            {% include 'snippets/about.html' with site_settings=site_settings %}
-        </blockquote>
+        {% include 'snippets/about.html' with site_settings=site_settings %}
     </div>
 
     <div class="column block">
         <h2 class="title">Code of Conduct</h2>
-        <blockquote>
-            {{ site_settings.code_of_conduct }}
-        </blockquote>
+        <div class="content">
+            {{ site_settings.code_of_conduct | safe }}
+        </div>
     </div>
 </div>
 {% endblock %}

bookwyrm/templates/book.html

@@ -11,7 +11,7 @@
 
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="level-right">
-            <a href="{{ book.id }}/edit">edit
+            <a href="{{ book.id }}/edit">
                 <span class="icon icon-pencil">
                     <span class="is-sr-only">Edit Book</span>
                 </span>

bookwyrm/templates/edit_book.html

@@ -78,6 +78,7 @@
     </div>
     <div class="block">
         <button class="button is-primary" type="submit">Save</button>
+        <a class="button is-danger is-light" href="/book/{{ book.id }}">Cancel</a>
     </div>
 </form>
 

bookwyrm/templates/login.html

@@ -51,6 +51,10 @@
     <div class="column">
         <div class="block">
             {% include 'snippets/about.html' with site_settings=site_settings %}
+
+            <p class="block">
+                <a href="/about/">More about this site</a>
+            </p>
         </div>
     </div>
 

bookwyrm/templates/snippets/about.html

@@ -5,7 +5,3 @@
 <p class="block">
     {{ site_settings.instance_description }}
 </p>
-
-<p class="block">
-    <a href="/about/">More about this site</a>
-</p>

bookwyrm/templates/snippets/follow_button.html

@@ -11,14 +11,14 @@ Follow request already sent.
     {% csrf_token %}
     <input type="hidden" name="user" value="{{ user.username }}">
     {% if user.manually_approves_followers %}
-        <button class="button is-small" type="submit">Send follow request</button>
+        <button class="button is-small is-link is-light" type="submit">Send follow request</button>
     {% else %}
-        <button class="button is-small" type="submit">Follow</button>
+        <button class="button is-small is-link is-light" type="submit">Follow</button>
     {% endif %}
 </form>
 <form action="/unfollow/" method="POST" onsubmit="interact(event)" class="follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
     {% csrf_token %}
     <input type="hidden" name="user" value="{{ user.username }}">
-    <button class="button is-small" type="submit">Unfollow</button>
+    <button class="button is-small is-danger is-light" type="submit">Unfollow</button>
 </form>
 {% endif %}