Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Font Awesome update to 5.2.0 #703

Open
wants to merge 8 commits into
base: v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/demo/templates/admin/base_site.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'admin/base_site.html' %}
{% load suit_tags admin_static %}
{% load suit_tags static %}

{# Following is an example how to extend admin by custom CSS or JS files #}
{# Add extra CSS for admin #}
Expand Down
2 changes: 1 addition & 1 deletion suit/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION = '2.0a1'
VERSION = '2.0a1.1'
default_app_config = 'suit.apps.DjangoSuitConfig'
5 changes: 5 additions & 0 deletions suit/static/suit/css/font-awesome-v4-shims.min.css

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions suit/static/suit/css/font-awesome.min.css

Large diffs are not rendered by default.

60 changes: 32 additions & 28 deletions suit/static/suit/css/suit.css

Large diffs are not rendered by default.

Binary file removed suit/static/suit/fonts/FontAwesome.otf
Binary file not shown.
Binary file removed suit/static/suit/fonts/fontawesome-webfont.eot
Binary file not shown.
2,671 changes: 0 additions & 2,671 deletions suit/static/suit/fonts/fontawesome-webfont.svg

This file was deleted.

Binary file removed suit/static/suit/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file removed suit/static/suit/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file removed suit/static/suit/fonts/fontawesome-webfont.woff2
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-brands-400.eot
Binary file not shown.
1,148 changes: 1,148 additions & 0 deletions suit/static/suit/webfonts/fa-brands-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added suit/static/suit/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-brands-400.woff
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-regular-400.eot
Binary file not shown.
467 changes: 467 additions & 0 deletions suit/static/suit/webfonts/fa-regular-400.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added suit/static/suit/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-regular-400.woff
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-solid-900.eot
Binary file not shown.
2,312 changes: 2,312 additions & 0 deletions suit/static/suit/webfonts/fa-solid-900.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added suit/static/suit/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-solid-900.woff
Binary file not shown.
Binary file added suit/static/suit/webfonts/fa-solid-900.woff2
Binary file not shown.
3 changes: 2 additions & 1 deletion suit/templates/admin/base.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{% extends 'admin/base.html' %}
{% load i18n admin_static suit_tags %}
{% load i18n static suit_tags %}

{% block stylesheet %}{% static "suit/css/suit.css" %}{% endblock %}

{% block extrastyle %}
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,500,700,900' rel='stylesheet' type='text/css'>
<link href='{% static "suit/css/font-awesome.min.css" %}' rel='stylesheet' type='text/css'>
<link href='{% static "suit/css/font-awesome-v4-shims.min.css" %}' rel='stylesheet' type='text/css'>
{% endblock %}

{% block bodyclass %}{{ block.super|suit_body_class:request }}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion suit/templates/admin/change_list_results.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load i18n admin_static suit_list %}
{% load i18n static suit_list %}
{% if result_hidden_fields %}
<div class="hiddenfields">{# DIV for HTML validation #}
{% for item in result_hidden_fields %}{{ item }}{% endfor %}
Expand Down