Skip to content
Snippets Groups Projects
Commit 5133b087 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

bootstrap moved to npm dependency

parent 77e1ea86
No related branches found
No related tags found
1 merge request!290Frontend dependencies moved to npm
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 12 deletions
smash/package-lock.json
+ 5
− 0
View file @ 5133b087
......@@ -106,6 +106,11 @@
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="
},
"bootstrap": {
"version": "3.3.6",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.6.tgz",
"integrity": "sha1-jej3SdyKdD8qxbUQ2Yg3Hj2qZYk="
},
"brfs": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz",
......
smash/package.json
+ 1
− 0
View file @ 5133b087
......@@ -10,6 +10,7 @@
"license": "ISC",
"dependencies": {
"awesomplete": "^1.1.5",
"bootstrap": "^3.3.6",
"datatables.net-bs": "^1.10.22",
"datatables.net-buttons": "^1.6.5",
"datatables.net-buttons-bs": "^1.6.5",
......
smash/smash/settings.py
+ 1
− 0
View file @ 5133b087
......@@ -120,6 +120,7 @@ STATICFILES_FINDERS = [
NPM_FILE_PATTERNS = {
'awesomplete': ['awesomplete.css', 'awesomplete.css.map', 'awesomplete.min.js', 'awesomplete.min.js.map'],
'bootstrap': ['dist/*','LICENSE'],
'datatables.net': ['js/*', 'License.txt'],
'datatables.net-bs': ['css/*', 'js/*', 'License.txt'],
'datatables.net-buttons': ['js/*', 'License.txt'],
......
smash/web/templates/_base.html
+ 2
− 2
View file @ 5133b087
......@@ -8,7 +8,7 @@
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -361,7 +361,7 @@ desired effect
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<script src="{% static 'jquery-ui-dist/jquery-ui.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- AdminLTE Template Helpers (for example- left side bar) -->
<script src="{% static 'AdminLTE/js/app.min.js' %}"></script>
<!-- Smash js -->
......
smash/web/templates/errors/400.html
+ 2
− 2
View file @ 5133b087
......@@ -8,7 +8,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -65,7 +65,7 @@
<!-- jQuery 2.2.3 -->
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- iCheck -->
<script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>
......
smash/web/templates/errors/403.html
+ 2
− 2
View file @ 5133b087
......@@ -8,7 +8,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -65,7 +65,7 @@
<!-- jQuery 2.2.3 -->
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- iCheck -->
<script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>
......
smash/web/templates/errors/404.html
+ 2
− 2
View file @ 5133b087
......@@ -8,7 +8,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -65,7 +65,7 @@
<!-- jQuery 2.2.3 -->
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- iCheck -->
<script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>
......
smash/web/templates/errors/500.html
+ 2
− 2
View file @ 5133b087
......@@ -8,7 +8,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -65,7 +65,7 @@
<!-- jQuery 2.2.3 -->
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- iCheck -->
<script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>
......
smash/web/templates/login.html
+ 2
− 2
View file @ 5133b087
......@@ -11,7 +11,7 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
{% block styles %}
<!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{% static 'AdminLTE/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.min.css' %}">
<!-- Font Awesome -->
<link rel="stylesheet"
......@@ -124,7 +124,7 @@
<!-- jQuery 2.2.3 -->
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
<script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}"></script>
<!-- iCheck -->
<script src="{% static 'AdminLTE/plugins/iCheck/icheck.min.js' %}"></script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment