fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maxscore style; fix exercise: Luki
[edumed.git]
/
edumed
/
settings.d
/
50-static.py
diff --git
a/edumed/settings.d/50-static.py
b/edumed/settings.d/50-static.py
index
23d963a
..
23de9b2
100644
(file)
--- a/
edumed/settings.d/50-static.py
+++ b/
edumed/settings.d/50-static.py
@@
-15,6
+15,7
@@
PIPELINE_JS_COMPRESSOR = None
PIPELINE_CSS = {
'base': {
'source_filenames': (
PIPELINE_CSS = {
'base': {
'source_filenames': (
+ 'jquery/colorbox/colorbox.css',
'css/base.scss',
'css/main.scss',
'catalogue/css/carousel.scss',
'css/base.scss',
'css/main.scss',
'catalogue/css/carousel.scss',
@@
-22,6
+23,7
@@
PIPELINE_CSS = {
'catalogue/css/lesson.scss',
'catalogue/css/exercise.scss',
'catalogue/css/section_list.scss',
'catalogue/css/lesson.scss',
'catalogue/css/exercise.scss',
'catalogue/css/section_list.scss',
+ 'curriculum/curriculum.scss',
),
'output_filename': 'compressed/base.css',
},
),
'output_filename': 'compressed/base.css',
},
@@
-31,9
+33,13
@@
PIPELINE_JS = {
'source_filenames': (
'catalogue/js/jquery-ui-1.10.0.custom.js',
'catalogue/js/jquery.cycle.all.js',
'source_filenames': (
'catalogue/js/jquery-ui-1.10.0.custom.js',
'catalogue/js/jquery.cycle.all.js',
+ 'jquery/colorbox/jquery.colorbox-min.js',
+ 'jquery/colorbox/jquery.colorbox-pl.js',
'catalogue/js/edumed.js',
'catalogue/js/edumed.js',
+ 'catalogue/js/lesson.js',
'catalogue/js/carousel.js',
'sponsors/js/sponsors.js',
'catalogue/js/carousel.js',
'sponsors/js/sponsors.js',
+ 'curriculum/curriculum.js',
),
'output_filename': 'compressed/base.js',
},
),
'output_filename': 'compressed/base.js',
},