diff options
| author | Weitian LI <liweitianux@gmail.com> | 2014-05-04 14:21:59 +0800 |
|---|---|---|
| committer | Weitian LI <liweitianux@gmail.com> | 2014-05-04 14:21:59 +0800 |
| commit | 1dff1d0b4bae3827223314d19fc2009dbc2c5706 (patch) | |
| tree | 8b50fae47ebe77772fae73299af93bea6c780f97 /django_skaschool | |
| parent | 702cd2099186cafcf0f1a4ffcda099cef3c9e178 (diff) | |
| download | django-skaschool-1dff1d0b4bae3827223314d19fc2009dbc2c5706.tar.bz2 | |
* added 'bootstrap-3.1.1' to static
* updated 'settings' to serve bootstrap from local ('respond.js'
required local css, otherwise extra configuration requires.)
Diffstat (limited to 'django_skaschool')
| -rw-r--r-- | django_skaschool/settings.py | 5 | ||||
| -rw-r--r-- | django_skaschool/settings_mysql.py | 5 | ||||
| -rw-r--r-- | django_skaschool/settings_production.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py index 9b4c779..9d6cb66 100644 --- a/django_skaschool/settings.py +++ b/django_skaschool/settings.py @@ -153,9 +153,12 @@ from settings_email import * ################################################# ## bootstrap3 +# Serve bootstrap3 from local. +# Otherwise 'respond.js' requires extra configuration with css on CDN. BOOTSTRAP3 = { 'jquery_url': '//code.jquery.com/jquery-1.11.0.min.js', - 'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + 'base_url': '/static/third-party/bootstrap/3.1.1/', 'css_url': None, 'theme_url': None, 'javascript_url': None, diff --git a/django_skaschool/settings_mysql.py b/django_skaschool/settings_mysql.py index e22444b..f5b1977 100644 --- a/django_skaschool/settings_mysql.py +++ b/django_skaschool/settings_mysql.py @@ -163,9 +163,12 @@ from settings_email import * ################################################# ## bootstrap3 +# Serve bootstrap3 from local. +# Otherwise 'respond.js' requires extra configuration with css on CDN. BOOTSTRAP3 = { 'jquery_url': '//code.jquery.com/jquery-1.11.0.min.js', - 'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + 'base_url': '/static/third-party/bootstrap/3.1.1/', 'css_url': None, 'theme_url': None, 'javascript_url': None, diff --git a/django_skaschool/settings_production.py b/django_skaschool/settings_production.py index 4c1533e..92a4528 100644 --- a/django_skaschool/settings_production.py +++ b/django_skaschool/settings_production.py @@ -176,9 +176,12 @@ MANAGERS = ADMINS ################################################# ## bootstrap3 +# Serve bootstrap3 from local. +# Otherwise 'respond.js' requires extra configuration with css on CDN. BOOTSTRAP3 = { 'jquery_url': '//code.jquery.com/jquery-1.11.0.min.js', - 'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/', + 'base_url': '/static/third-party/bootstrap/3.1.1/', 'css_url': None, 'theme_url': None, 'javascript_url': None, |