fnp
/
emels.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update fnpdjango
[emels.git]
/
emels
/
settings
/
static.py
diff --git
a/emels/settings/static.py
b/emels/settings/static.py
index
17a4143
..
96b1e9c
100644
(file)
--- a/
emels/settings/static.py
+++ b/
emels/settings/static.py
@@
-20,10
+20,11
@@
PIPELINE = {
'STYLESHEETS': {
'base': {
'source_filenames': (
'STYLESHEETS': {
'base': {
'source_filenames': (
- 'css/base.scss',
- 'css/main.scss',
- 'jquery/colorbox/colorbox.css',
- 'fnpdjango/annoy/annoy.css',
+ 'css/base.scss',
+ 'css/main.scss',
+ 'css/entry.scss',
+ 'jquery/colorbox/colorbox.css',
+ 'fnpdjango/annoy/annoy.css',
),
'output_filename': 'compressed/base.css',
},
),
'output_filename': 'compressed/base.css',
},
@@
-31,9
+32,11
@@
PIPELINE = {
'JAVASCRIPT': {
'base': {
'source_filenames': (
'JAVASCRIPT': {
'base': {
'source_filenames': (
+ 'jquery/cycle/jquery.cycle.all.js',
'jquery/colorbox/jquery.colorbox-min.js',
'jquery/colorbox/jquery.colorbox-pl.js',
'js/formset.js',
'jquery/colorbox/jquery.colorbox-min.js',
'jquery/colorbox/jquery.colorbox-pl.js',
'js/formset.js',
+ 'sponsors/js/sponsors.js',
'fnpdjango/annoy/annoy.js',
),
'output_filename': 'compressed/base.js',
'fnpdjango/annoy/annoy.js',
),
'output_filename': 'compressed/base.js',