klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-07-01 10:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix' into 'master'

Browse Source 
Fix external ressources

See merge request ae/Sith!128
This commit is contained in:
Antoine Bartuccio 2017-11-05 23:31:29 +01:00
commit 9ab7cb98dc
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/templates/core/base.jinja
View File

@ -9,16 +9,12 @@
<link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
<link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
<link rel="stylesheet" href="{{ scss('core/style.scss') }}">
<link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
{% if settings.EXTERNAL_RES %}
<noscript><link rel="stylesheet" href="https://use.fontawesome.com/775817bb35.css"></noscript>
<script src="https://use.fontawesome.com/c06c9c6980.js"></script>
<noscript><link rel="stylesheet" type="text/css" href="static('core/js/ui/jquery-ui.min.css')"></noscript>
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
{% else %}
<link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
<link rel="stylesheet" href="{{ static('core/js/ui/jquery-ui.min.css') }}">
{% endif %}
{% endblock %}
</head>