diff --git a/.gitignore b/.gitignore index 52ece255..9c39281b 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,5 @@ codecheck/static/ codecheck_venv/bin/ codecheck_venv/ staticfiles/ + +\.DS_Store diff --git a/codecheck/settings.py b/codecheck/settings.py index d230735c..e09fd22f 100644 --- a/codecheck/settings.py +++ b/codecheck/settings.py @@ -43,11 +43,10 @@ 'allauth.socialaccount', 'allauth.socialaccount.providers.google', 'allauth.socialaccount.providers.github', - + 'sass_processor', ] MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -58,8 +57,6 @@ 'whitenoise.middleware.WhiteNoiseMiddleware', 'codecheck.middleware.AuthRequiredMiddleware.AuthRequiredMiddleware' - - ] ROOT_URLCONF = 'codecheck.urls' @@ -132,6 +129,12 @@ os.path.join(STATIC_FILE_DIR_ROOT, 'static'), ] +# Adding the sass finder to locate the generated .css file +STATICFILES_FINDERS = [ + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'sass_processor.finders.CssFinder', +] LOGIN_URL = "/accounts/login/" LOGOUT_URL = "/accounts/logout/" diff --git a/requirements-dev.txt b/requirements-dev.txt index acd761bc..f4c20a62 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,18 +1,25 @@ -certifi==2017.7.27.1 -chardet==3.0.4 -defusedxml==0.5.0 -dj-database-url==0.3.0 -dj-static==0.0.6 -Django==1.11.4 -django-allauth==0.33.0 -django-crispy-forms==1.6.1 -idna==2.6 -oauthlib==2.0.2 -python-decouple==3.1 -python3-openid==3.1.0 -pytz==2017.2 -requests==2.18.4 -requests-oauthlib==0.8.0 -static3==0.7.0 -urllib3==1.22 -whitenoise==3.3.0 +certifi==2017.7.27.1 +chardet==3.0.4 +defusedxml==0.5.0 +dj-database-url==0.3.0 +dj-static==0.0.6 +Django==1.11.4 +django-allauth==0.33.0 +django-appconf==1.0.2 +django-compressor==2.2 +django-crispy-forms==1.6.1 +django-sass-processor==0.5.7 +idna==2.6 +libsass==0.13.4 +oauthlib==2.0.2 +python-decouple==3.1 +python3-openid==3.1.0 +pytz==2017.2 +rcssmin==1.0.6 +requests==2.18.4 +requests-oauthlib==0.8.0 +rjsmin==1.0.12 +six==1.11.0 +static3==0.7.0 +urllib3==1.22 +whitenoise==3.3.0