fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug with related tags and object display when tag spanned both books and pictures
[wolnelektury.git]
/
wolnelektury
/
settings
/
static.py
diff --git
a/wolnelektury/settings/static.py
b/wolnelektury/settings/static.py
index
a6f5d1b
..
472b2e9
100644
(file)
--- a/
wolnelektury/settings/static.py
+++ b/
wolnelektury/settings/static.py
@@
-44,6
+44,8
@@
PIPELINE_CSS = {
'source_filenames': [
'scss/book_text.scss',
'css/new.book.css',
'source_filenames': [
'scss/book_text.scss',
'css/new.book.css',
+
+ 'css/master.picture.css',
],
'output_filename': 'css/compressed/book_text.css',
},
],
'output_filename': 'css/compressed/book_text.css',
},
@@
-108,10
+110,10
@@
PIPELINE_JS = {
'js/jquery.highlightfade.js',
'js/book_text/other.js',
'js/book.js',
'js/jquery.highlightfade.js',
'js/book_text/other.js',
'js/book.js',
- 'js/picture.js',
+
'js/raphael-min.js',
'js/raphael-min.js',
- 'player/openplayer.js',
'js/progressSpin.min.js',
'js/progressSpin.min.js',
+ 'js/picture.js',
],
'output_filename': 'js/book.min.js',
},
],
'output_filename': 'js/book.min.js',
},
@@
-122,6
+124,12
@@
PIPELINE_JS = {
'js/book_text/*.js',
'js/locale.js',
'js/dialogs.js',
'js/book_text/*.js',
'js/locale.js',
'js/dialogs.js',
+
+ 'js/jquery.highlightfade.js',
+ 'js/raphael-min.js',
+ 'player/openplayer.js',
+ 'js/progressSpin.min.js',
+ 'js/picture.js',
],
'output_filename': 'js/book_text.js',
},
],
'output_filename': 'js/book_text.js',
},