Merge pull request #477 from HorayNarea/master

don't require BootstrapCDN for FontAwesome (GDPR-compliance)
7 years ago · b25325912a
parent d4cc142f64 7d661ab80d
commit b25325912a
8 changed files with 2676 additions and 1 deletions
--- a/core/admin/mailu/ui/static/fontawesome/css/font-awesome.min.css
+++ b/core/admin/mailu/ui/static/fontawesome/css/font-awesome.min.css
--- a/core/admin/mailu/ui/static/fontawesome/fonts/FontAwesome.otf
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/FontAwesome.otf
--- a/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.eot
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.eot
--- a/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.svg
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.svg
--- a/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.ttf
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.ttf
--- a/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.woff
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.woff
--- a/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.woff2
+++ b/core/admin/mailu/ui/static/fontawesome/fonts/fontawesome-webfont.woff2
--- a/core/admin/mailu/ui/templates/base.html
+++ b/core/admin/mailu/ui/templates/base.html
@ -5,7 +5,7 @@
 {% block styles %}
 {{super()}}
 <link rel="stylesheet" href="{{ url_for('.static', filename='select2/css/select2.min.css') }}">
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
+<link rel="stylesheet" href="{{ url_for('.static', filename='fontawesome/css/font-awesome.min.css) }}">
 <link rel="stylesheet" href="{{ url_for('.static', filename='adminlte/css/AdminLTE.min.css') }}">
 <link rel="stylesheet" href="{{ url_for('.static', filename='adminlte/css/skin-blue.min.css') }}">
 <link rel="stylesheet" href="{{ url_for('.static', filename='app.css') }}">