From 6d912de3764b22b6d4ea6fc6e0e243ecb395e2b4 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Wed, 6 Dec 2017 14:07:59 +1100 Subject: [PATCH] Migrate to Font Awesome 5 - every icon used in the site has been updated, but the site icons that live in the database will need fixing separately --- entries/kinds.py | 12 ++++++------ entries/templates/entries/h-entry.html | 8 ++++---- home/templates/home/index.html | 4 ++-- lemonauth/templates/lemonauth/indie.html | 6 +++--- lemonauth/templates/lemonauth/login.html | 2 +- lemoncurry/templates/lemoncurry/layout.html | 2 +- lemoncurry/templatetags/lemoncurry_tags.py | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/entries/kinds.py b/entries/kinds.py index f0cade7..e55ddc6 100644 --- a/entries/kinds.py +++ b/entries/kinds.py @@ -25,41 +25,41 @@ class Entry: Note = Entry( id='note', - icon='fa fa-paper-plane', + icon='fas fa-paper-plane', plural='notes', ) Article = Entry( id='article', - icon='fa fa-file-text', + icon='fas fa-file-alt', plural='articles', slug=True, ) Photo = Entry( id='photo', - icon='fa fa-camera', + icon='fas fa-camera', plural='photos', ) Reply = Entry( id='reply', - icon='fa fa-comment', + icon='fas fa-comment', plural='replies', on_home=False, ) Like = Entry( id='like', - icon='fa fa-heart', + icon='fas fa-heart', plural='likes', on_home=False, ) Repost = Entry( id='repost', - icon='fa fa-retweet', + icon='fas fa-retweet', plural='reposts', ) diff --git a/entries/templates/entries/h-entry.html b/entries/templates/entries/h-entry.html index 7dcf043..a92baa2 100644 --- a/entries/templates/entries/h-entry.html +++ b/entries/templates/entries/h-entry.html @@ -25,17 +25,17 @@ {% if entry.updated != entry.published %} {% shortlink entry as short %} - + {{ short | friendly_url }} {% endif %} @@ -45,7 +45,7 @@
{% for c in entry.cats.all %} - + {{ c.name }} {% endfor %} diff --git a/home/templates/home/index.html b/home/templates/home/index.html index 732099e..dc3e8f4 100644 --- a/home/templates/home/index.html +++ b/home/templates/home/index.html @@ -24,7 +24,7 @@
  • - {{ user.email }} + {{ user.email }}
    • {% if user.xmpp %}
  • {{ user.xmpp }} @@ -36,7 +36,7 @@
      {% for key in user.keys.all %}
    • - {{ key.pretty_print }} + {{ key.pretty_print }}
      • {% endfor %} diff --git a/lemonauth/templates/lemonauth/indie.html b/lemonauth/templates/lemonauth/indie.html index d13a48c..86e0b1d 100644 --- a/lemonauth/templates/lemonauth/indie.html +++ b/lemonauth/templates/lemonauth/indie.html @@ -14,9 +14,9 @@ {% if app %}{{ app.name | first }}{% endif %} {% if app %}({% endif %}{{ params.client_id }}{% if app %}){% endif %}? {% if verified %} - + {% else %} - + {% endif %} @@ -39,7 +39,7 @@
      diff --git a/lemonauth/templates/lemonauth/login.html b/lemonauth/templates/lemonauth/login.html index d29e864..6bf2bf1 100644 --- a/lemonauth/templates/lemonauth/login.html +++ b/lemonauth/templates/lemonauth/login.html @@ -42,7 +42,7 @@
      diff --git a/lemoncurry/templates/lemoncurry/layout.html b/lemoncurry/templates/lemoncurry/layout.html index 58d7dbb..e8171da 100644 --- a/lemoncurry/templates/lemoncurry/layout.html +++ b/lemoncurry/templates/lemoncurry/layout.html @@ -37,7 +37,7 @@ {% block styles %}{% endblock %} {% endcompress %} - + {% analytical_head_bottom %} diff --git a/lemoncurry/templatetags/lemoncurry_tags.py b/lemoncurry/templatetags/lemoncurry_tags.py index 9295f34..e92da3b 100644 --- a/lemoncurry/templatetags/lemoncurry_tags.py +++ b/lemoncurry/templatetags/lemoncurry_tags.py @@ -52,12 +52,12 @@ def nav_left(request): def nav_right(request): if request.user.is_authenticated(): items = ( - MenuItem(label='admin', icon='fa fa-gear', url='admin:index'), - MenuItem(label='log out', icon='fa fa-sign-out', url='lemonauth:logout'), + MenuItem(label='admin', icon='fas fa-cog', url='admin:index'), + MenuItem(label='log out', icon='fas fa-sign-out-alt', url='lemonauth:logout'), ) else: items = ( - MenuItem(label='log in', icon='fa fa-sign-in', url='lemonauth:login'), + MenuItem(label='log in', icon='fas fa-sign-in-alt', url='lemonauth:login'), ) return {'items': items, 'request': request}