correct the static files setup

2020-04-20 15:22:48 +02:00 · 2020-04-20 15:22:48 +02:00 · 8310a1569a
parent a513de51e7
commit 8310a1569a
25 changed files with 2 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -174,5 +174,4 @@ migrations/
 htmlcov/
 .second_run

-network_inventory/static/
-!network_inventory/static/core
+/static
--- a/network_inventory/static/core/.versions
+++ b/network_inventory/static/core/.versions
--- a/network_inventory/static/core/css/bootstrap-grid.css
+++ b/network_inventory/static/core/css/bootstrap-grid.css
--- a/network_inventory/static/core/css/bootstrap-grid.css.map
+++ b/network_inventory/static/core/css/bootstrap-grid.css.map
--- a/network_inventory/static/core/css/bootstrap-grid.min.css
+++ b/network_inventory/static/core/css/bootstrap-grid.min.css
--- a/network_inventory/static/core/css/bootstrap-grid.min.css.map
+++ b/network_inventory/static/core/css/bootstrap-grid.min.css.map
--- a/network_inventory/static/core/css/bootstrap-reboot.css
+++ b/network_inventory/static/core/css/bootstrap-reboot.css
--- a/network_inventory/static/core/css/bootstrap-reboot.css.map
+++ b/network_inventory/static/core/css/bootstrap-reboot.css.map
--- a/network_inventory/static/core/css/bootstrap-reboot.min.css
+++ b/network_inventory/static/core/css/bootstrap-reboot.min.css
--- a/network_inventory/static/core/css/bootstrap-reboot.min.css.map
+++ b/network_inventory/static/core/css/bootstrap-reboot.min.css.map
--- a/network_inventory/static/core/css/bootstrap.css
+++ b/network_inventory/static/core/css/bootstrap.css
--- a/network_inventory/static/core/css/bootstrap.css.map
+++ b/network_inventory/static/core/css/bootstrap.css.map
--- a/network_inventory/static/core/css/bootstrap.min.css
+++ b/network_inventory/static/core/css/bootstrap.min.css
--- a/network_inventory/static/core/css/bootstrap.min.css.map
+++ b/network_inventory/static/core/css/bootstrap.min.css.map
--- a/network_inventory/static/core/js/bootstrap.bundle.js
+++ b/network_inventory/static/core/js/bootstrap.bundle.js
--- a/network_inventory/static/core/js/bootstrap.bundle.js.map
+++ b/network_inventory/static/core/js/bootstrap.bundle.js.map
--- a/network_inventory/static/core/js/bootstrap.bundle.min.js
+++ b/network_inventory/static/core/js/bootstrap.bundle.min.js
--- a/network_inventory/static/core/js/bootstrap.bundle.min.js.map
+++ b/network_inventory/static/core/js/bootstrap.bundle.min.js.map
--- a/network_inventory/static/core/js/bootstrap.js
+++ b/network_inventory/static/core/js/bootstrap.js
--- a/network_inventory/static/core/js/bootstrap.js.map
+++ b/network_inventory/static/core/js/bootstrap.js.map
--- a/network_inventory/static/core/js/bootstrap.min.js
+++ b/network_inventory/static/core/js/bootstrap.min.js
--- a/network_inventory/static/core/js/bootstrap.min.js.map
+++ b/network_inventory/static/core/js/bootstrap.min.js.map
--- a/network_inventory/static/core/js/jquery.slim.min.js
+++ b/network_inventory/static/core/js/jquery.slim.min.js
--- a/network_inventory/static/core/js/popper.min.js
+++ b/network_inventory/static/core/js/popper.min.js
--- a/network_inventory/settings/base.py
+++ b/network_inventory/settings/base.py
@ -125,7 +125,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "..", "static")

 DJANGO_TABLES2_TEMPLATE = "django_tables2/bootstrap4.html"
 CRISPY_TEMPLATE_PACK = 'bootstrap4'