Merge pull request #429 from ubccr/static-assets

Upgrade bootstrap and serve css/js assets locally instead of cdn.
ubccr · Jul 7, 2022 · 5ea5784 · 5ea5784
2 parents 19d83c2 + 9dc087e
commit 5ea5784
Show file tree

Hide file tree

Showing 17 changed files with 263 additions and 14 deletions.
diff --git a/coldfront/config/base.py b/coldfront/config/base.py
@@ -2,6 +2,7 @@
 Base Django settings for ColdFront project.
 """
 import os
+import sys
 import coldfront
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.utils import get_random_secret_key
@@ -49,11 +50,14 @@
 ]
 
 # Additional Apps
+# Hack to fix fontawesome. Will be fixed in version 6
+sys.modules['fontawesome_free'] = __import__('fontawesome-free')
 INSTALLED_APPS += [
  'crispy_forms',
  'sslserver',
  'django_q',
  'simple_history',
+ 'fontawesome_free',
 ]
 
 # ColdFront Apps

diff --git a/coldfront/static/bootstrap/bootstrap.bundle.min.js b/coldfront/static/bootstrap/bootstrap.bundle.min.js
diff --git a/coldfront/static/bootstrap/bootstrap.bundle.min.js.map b/coldfront/static/bootstrap/bootstrap.bundle.min.js.map
diff --git a/coldfront/static/bootstrap/bootstrap.min.css b/coldfront/static/bootstrap/bootstrap.min.css
diff --git a/coldfront/static/bootstrap/bootstrap.min.css.map b/coldfront/static/bootstrap/bootstrap.min.css.map
diff --git a/coldfront/static/datatable/dataTables.bootstrap4.min.css b/coldfront/static/datatable/dataTables.bootstrap4.min.css
diff --git a/coldfront/static/datatable/dataTables.bootstrap4.min.js b/coldfront/static/datatable/dataTables.bootstrap4.min.js