diff --git a/.gitignore b/.gitignore index 1be258215..cc747adf4 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,4 @@ target/ # specific to this project static -bower_components +bower diff --git a/sapl/settings.py b/sapl/settings.py index 73fed924f..b0f1d140f 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -52,15 +52,10 @@ INSTALLED_APPS = ( # more 'django_extensions', - 'bootstrap3', + 'djangobower', + 'bootstrap3', # basically for django_admin_bootstrapped 'crispy_forms', - - # zurb foundation - 'foundation', 'crispy_forms_foundation', - - # bower - 'djangobower', ) MIDDLEWARE_CLASSES = ( @@ -135,7 +130,7 @@ DAB_FIELD_RENDERER = \ CRISPY_TEMPLATE_PACK = 'foundation-5' CRISPY_FAIL_SILENTLY = not DEBUG -BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, "bower_components") +BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, "bower") STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', @@ -144,8 +139,7 @@ STATICFILES_FINDERS = ( ) BOWER_INSTALLED_APPS = ( - 'jquery#1.9', - 'underscore', + 'foundation', 'foundation-datepicker', 'components-font-awesome', 'foundation-icon-fonts',