From 1cc69ddac0c103610ba5c461d34585cebcaa514e Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 9 Jul 2018 12:23:22 +0200 Subject: [PATCH] Make navbar a real bootstrap navbar and switch from Font Awesome to Line Awesome (because it's libre) --- ivatar/tools/templates/check.html | 24 +++---- templates/_account_bar.html | 28 +++++++++ templates/base.html | 101 ++++++++++++++---------------- templates/header.html | 2 +- 4 files changed, 87 insertions(+), 68 deletions(-) create mode 100644 templates/_account_bar.html diff --git a/ivatar/tools/templates/check.html b/ivatar/tools/templates/check.html index ee12dd8..bd7d944 100644 --- a/ivatar/tools/templates/check.html +++ b/ivatar/tools/templates/check.html @@ -42,9 +42,9 @@
- +
- +

MD5 @@ -56,9 +56,9 @@
- +
- +

MD5 @@ -70,9 +70,9 @@
- +
- +

SHA256 @@ -84,9 +84,9 @@
- +
- +

SHA256 @@ -101,9 +101,9 @@
- +
- +

SHA256 @@ -115,9 +115,9 @@
- +
- +

SHA256 diff --git a/templates/_account_bar.html b/templates/_account_bar.html new file mode 100644 index 0000000..5b55d9a --- /dev/null +++ b/templates/_account_bar.html @@ -0,0 +1,28 @@ +{% load i18n %} + + diff --git a/templates/base.html b/templates/base.html index 1d6a0fc..3761208 100644 --- a/templates/base.html +++ b/templates/base.html @@ -8,61 +8,52 @@ {% block title %}Libravatar - {% trans 'Freeing the Web, one face at a time!' %}{% endblock title %} {% endblock bootstrap4_extra_head %} + {% block topbar_base %} + + {% endblock %} {% autoescape off %}{% bootstrap_messages %}{% endautoescape %}
diff --git a/templates/header.html b/templates/header.html index 5fd91de..4c8d437 100644 --- a/templates/header.html +++ b/templates/header.html @@ -19,7 +19,7 @@ - + {% if user.is_authenticated %} {% if user.userpreference and user.userpreference.theme != 'default' %}