From 2568bf9b6fe53208697f9a781a98b7fff979db40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Mon, 14 May 2018 16:11:25 +0200 Subject: [PATCH] Vendorize jQuery + FA (with nitpicking) --- .gitignore | 2 +- .../allauth_ens/fonts/{roboto.css => index.css} | 5 ++--- .../font-awesome/4.7.0}/css/font-awesome.css | 0 .../font-awesome/4.7.0}/css/font-awesome.min.css | 0 .../4.7.0}/fonts/fontawesome-webfont.eot | Bin .../4.7.0}/fonts/fontawesome-webfont.svg | 0 .../4.7.0}/fonts/fontawesome-webfont.ttf | Bin .../4.7.0}/fonts/fontawesome-webfont.woff | Bin .../4.7.0}/fonts/fontawesome-webfont.woff2 | Bin .../jquery/3.2.1}/jquery-3.2.1.slim.min.js | 0 allauth_ens/templates/allauth_ens/base.html | 13 +++++-------- 11 files changed, 8 insertions(+), 12 deletions(-) rename allauth_ens/static/allauth_ens/fonts/{roboto.css => index.css} (85%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/css/font-awesome.css (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/css/font-awesome.min.css (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/fonts/fontawesome-webfont.eot (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/fonts/fontawesome-webfont.svg (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/fonts/fontawesome-webfont.ttf (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/fonts/fontawesome-webfont.woff (100%) rename allauth_ens/static/{font-awesome => vendor/font-awesome/4.7.0}/fonts/fontawesome-webfont.woff2 (100%) rename allauth_ens/static/{allauth_ens => vendor/jquery/3.2.1}/jquery-3.2.1.slim.min.js (100%) diff --git a/.gitignore b/.gitignore index 73e3584..3127a92 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .tox/ build/ dist/ -vendor/ +/vendor/ venv/ *~ diff --git a/allauth_ens/static/allauth_ens/fonts/roboto.css b/allauth_ens/static/allauth_ens/fonts/index.css similarity index 85% rename from allauth_ens/static/allauth_ens/fonts/roboto.css rename to allauth_ens/static/allauth_ens/fonts/index.css index f2aa169..0c978b1 100644 --- a/allauth_ens/static/allauth_ens/fonts/roboto.css +++ b/allauth_ens/static/allauth_ens/fonts/index.css @@ -1,6 +1,5 @@ -/** This CSS file was taken from fonts.google.com - * - * The font "roboto" and its derivatives are under Apache license, as published +/** + * The font "Roboto" and its derivatives are under Apache license, as published * here: https://www.apache.org/licenses/LICENSE-2.0 * The font is by Christian Robertson. Thanks! */ diff --git a/allauth_ens/static/font-awesome/css/font-awesome.css b/allauth_ens/static/vendor/font-awesome/4.7.0/css/font-awesome.css similarity index 100% rename from allauth_ens/static/font-awesome/css/font-awesome.css rename to allauth_ens/static/vendor/font-awesome/4.7.0/css/font-awesome.css diff --git a/allauth_ens/static/font-awesome/css/font-awesome.min.css b/allauth_ens/static/vendor/font-awesome/4.7.0/css/font-awesome.min.css similarity index 100% rename from allauth_ens/static/font-awesome/css/font-awesome.min.css rename to allauth_ens/static/vendor/font-awesome/4.7.0/css/font-awesome.min.css diff --git a/allauth_ens/static/font-awesome/fonts/fontawesome-webfont.eot b/allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.eot similarity index 100% rename from allauth_ens/static/font-awesome/fonts/fontawesome-webfont.eot rename to allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.eot diff --git a/allauth_ens/static/font-awesome/fonts/fontawesome-webfont.svg b/allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.svg similarity index 100% rename from allauth_ens/static/font-awesome/fonts/fontawesome-webfont.svg rename to allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.svg diff --git a/allauth_ens/static/font-awesome/fonts/fontawesome-webfont.ttf b/allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from allauth_ens/static/font-awesome/fonts/fontawesome-webfont.ttf rename to allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf diff --git a/allauth_ens/static/font-awesome/fonts/fontawesome-webfont.woff b/allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.woff similarity index 100% rename from allauth_ens/static/font-awesome/fonts/fontawesome-webfont.woff rename to allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.woff diff --git a/allauth_ens/static/font-awesome/fonts/fontawesome-webfont.woff2 b/allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from allauth_ens/static/font-awesome/fonts/fontawesome-webfont.woff2 rename to allauth_ens/static/vendor/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2 diff --git a/allauth_ens/static/allauth_ens/jquery-3.2.1.slim.min.js b/allauth_ens/static/vendor/jquery/3.2.1/jquery-3.2.1.slim.min.js similarity index 100% rename from allauth_ens/static/allauth_ens/jquery-3.2.1.slim.min.js rename to allauth_ens/static/vendor/jquery/3.2.1/jquery-3.2.1.slim.min.js diff --git a/allauth_ens/templates/allauth_ens/base.html b/allauth_ens/templates/allauth_ens/base.html index 2cfedd5..7606848 100644 --- a/allauth_ens/templates/allauth_ens/base.html +++ b/allauth_ens/templates/allauth_ens/base.html @@ -16,20 +16,17 @@ {# CSS #} + href="{% static "vendor/font-awesome/4.7.0/css/font-awesome.min.css" %}"> + href="{% static "allauth_ens/fonts/index.css" %}"> + href="{% static "allauth_ens/screen.css" %}"> {# JS #} + src="{% static "vendor/jquery/3.2.1/jquery-3.2.1.slim.min.js" %}"> + src="{% static "allauth_ens/authens.js" %}"> {% block extra_js %}{% endblock %}