Merge branch 'main' into progress_update

2020-11-27 15:52:55 -08:00
parent 97e49c4bd2 1df5b2d481
commit 85026b837c
47 changed files with 745 additions and 519 deletions
--- a/bookwyrm/templates/feed.html
+++ b/bookwyrm/templates/feed.html
@ -68,6 +68,7 @@
    </div>

    <div class="column is-two-thirds" id="feed">
+        <h1 class="title">{{ tab | title }} Timeline</h1>
        <div class="tabs">
            <ul>
                <li class="{% if tab == 'home' %}is-active{% endif %}">