Merge branch 'tobast-no-cdn' into 'master'

Remove CDN dependencies, copy files locally

See merge request cof-geek/django-allauth-ens!5
This commit is contained in:
Aurélien Delobelle 2018-05-14 16:14:40 +02:00
commit 9b45fc54c7
14 changed files with 5044 additions and 8 deletions

2
.gitignore vendored
View file

@ -3,7 +3,7 @@
.tox/
build/
dist/
vendor/
/vendor/
venv/
*~

View file

@ -0,0 +1,24 @@
/**
* 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!
*/
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'), url(roboto-regular.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: local('Roboto Bold'), local('Roboto-Bold'), url(roboto-bold.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto Slab';
font-style: normal;
font-weight: 400;
src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(roboto-slab-regular.ttf) format('truetype');
}

Binary file not shown.

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load diff

After

Width:  |  Height:  |  Size: 434 KiB

File diff suppressed because one or more lines are too long

View file

@ -16,19 +16,15 @@
{# CSS #}
<link rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:400,700|Roboto+Slab:400">
href="{% static "vendor/font-awesome/4.7.0/css/font-awesome.min.css" %}">
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
crossorigin="anonymous">
href="{% static "allauth_ens/fonts/index.css" %}">
<link rel="stylesheet"
href="{% static "allauth_ens/screen.css" %}">
{# JS #}
<script type="text/javascript"
src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha256-k2WSCIexGzOj3Euiig+TlR8gA0EmPjuc79OEeY5L45g="
crossorigin="anonymous"></script>
src="{% static "vendor/jquery/3.2.1/jquery-3.2.1.slim.min.js" %}"></script>
<script type="text/javascript"
src="{% static "allauth_ens/authens.js" %}"></script>