Merge branch 'main' into code-scanning

This commit is contained in:
Vivianne Langdon
2022-02-26 17:54:33 -08:00
225 changed files with 14672 additions and 5229 deletions

View File

@ -1,14 +1,14 @@
{% load layout %}
{% load i18n %}
{% load static %}
{% load sass_tags %}
<!DOCTYPE html>
<html lang="{% get_lang %}">
<head>
<title>{% block title %}BookWyrm{% endblock %} - {{ site.name }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{% static "css/vendor/bulma.min.css" %}">
<link rel="stylesheet" href="{% static "css/vendor/icons.css" %}">
<link rel="stylesheet" href="{% static "css/bookwyrm.css" %}">
<link href="{% sass_src 'css/bookwyrm.scss' %}" rel="stylesheet" type="text/css" />
<link rel="search" type="application/opensearchdescription+xml" href="{% url 'opensearch' %}" title="{% blocktrans with site_name=site.name %}{{ site_name }} search{% endblocktrans %}" />
@ -32,6 +32,7 @@
{% block head_links %}{% endblock %}
</head>
<body>
{% block body %}
<nav class="navbar" aria-label="main navigation">
<div class="container">
<div class="navbar-brand">
@ -212,7 +213,7 @@
</div>
{% endif %}
<div class="section is-flex-grow-1">
<main class="section is-flex-grow-1">
<div class="container">
{# almost every view needs to know the user shelves #}
{% with request.user.shelf_set.all as user_shelves %}
@ -220,7 +221,7 @@
{% endblock %}
{% endwith %}
</div>
</div>
</main>
<div role="region" aria-live="polite" id="live-messages">
<p id="status-success-message" class="live-message is-sr-only is-hidden">{% trans "Successfully posted status" %}</p>
@ -262,6 +263,7 @@
</div>
</div>
</footer>
{% endblock %}
<script>
var csrf_token = '{{ csrf_token }}';