Merge remote-tracking branch 'origin/master'

2017-10-08 11:52:02 +03:00 · 2017-10-08 11:52:02 +03:00 · d562d81389
commit d562d81389
parent cae536adea 5b6f08a5c6
31 changed files with 3 additions and 1 deletions
--- a/challenges/settings.py
+++ b/challenges/settings.py
@ -121,8 +121,10 @@ USE_TZ = True

 STATIC_URL = '/static/'

+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'static')
+    os.path.join(BASE_DIR, 'staticfiles')
 ]

 MEDIA_URL = '/media/'
--- a/staticfiles/css/3-col-portfolio.css
+++ b/staticfiles/css/3-col-portfolio.css
--- a/staticfiles/css/app.css
+++ b/staticfiles/css/app.css
--- a/staticfiles/css/bootstrap-grid.css
+++ b/staticfiles/css/bootstrap-grid.css
--- a/staticfiles/css/bootstrap-grid.css.map
+++ b/staticfiles/css/bootstrap-grid.css.map
--- a/staticfiles/css/bootstrap-grid.min.css
+++ b/staticfiles/css/bootstrap-grid.min.css
--- a/staticfiles/css/bootstrap-grid.min.css.map
+++ b/staticfiles/css/bootstrap-grid.min.css.map
--- a/staticfiles/css/bootstrap-reboot.css
+++ b/staticfiles/css/bootstrap-reboot.css
--- a/staticfiles/css/bootstrap-reboot.css.map
+++ b/staticfiles/css/bootstrap-reboot.css.map
--- a/staticfiles/css/bootstrap-reboot.min.css
+++ b/staticfiles/css/bootstrap-reboot.min.css
--- a/staticfiles/css/bootstrap-reboot.min.css.map
+++ b/staticfiles/css/bootstrap-reboot.min.css.map
--- a/staticfiles/css/bootstrap.css
+++ b/staticfiles/css/bootstrap.css
--- a/staticfiles/css/bootstrap.css.map
+++ b/staticfiles/css/bootstrap.css.map
--- a/staticfiles/css/bootstrap.min.css
+++ b/staticfiles/css/bootstrap.min.css
--- a/staticfiles/css/bootstrap.min.css.map
+++ b/staticfiles/css/bootstrap.min.css.map
--- a/staticfiles/css/index.css
+++ b/staticfiles/css/index.css
--- a/staticfiles/css/materialize.min.css
+++ b/staticfiles/css/materialize.min.css
--- a/staticfiles/favicon.ico
+++ b/staticfiles/favicon.ico
--- a/staticfiles/fonts/roboto/Roboto-Bold.woff
+++ b/staticfiles/fonts/roboto/Roboto-Bold.woff
--- a/staticfiles/fonts/roboto/Roboto-Bold.woff2
+++ b/staticfiles/fonts/roboto/Roboto-Bold.woff2
--- a/staticfiles/fonts/roboto/Roboto-Light.woff
+++ b/staticfiles/fonts/roboto/Roboto-Light.woff
--- a/staticfiles/fonts/roboto/Roboto-Light.woff2
+++ b/staticfiles/fonts/roboto/Roboto-Light.woff2
--- a/staticfiles/fonts/roboto/Roboto-Medium.woff
+++ b/staticfiles/fonts/roboto/Roboto-Medium.woff
--- a/staticfiles/fonts/roboto/Roboto-Medium.woff2
+++ b/staticfiles/fonts/roboto/Roboto-Medium.woff2
--- a/staticfiles/fonts/roboto/Roboto-Regular.woff
+++ b/staticfiles/fonts/roboto/Roboto-Regular.woff
--- a/staticfiles/fonts/roboto/Roboto-Regular.woff2
+++ b/staticfiles/fonts/roboto/Roboto-Regular.woff2
--- a/staticfiles/fonts/roboto/Roboto-Thin.woff
+++ b/staticfiles/fonts/roboto/Roboto-Thin.woff
--- a/staticfiles/fonts/roboto/Roboto-Thin.woff2
+++ b/staticfiles/fonts/roboto/Roboto-Thin.woff2
--- a/staticfiles/js/app.js
+++ b/staticfiles/js/app.js
--- a/staticfiles/js/bootstrap.js
+++ b/staticfiles/js/bootstrap.js
--- a/staticfiles/js/bootstrap.min.js
+++ b/staticfiles/js/bootstrap.min.js