fnp
/
prawokultury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into search
[prawokultury.git]
/
prawokultury
/
settings.d
/
50-static.conf
diff --git
a/prawokultury/settings.d/50-static.conf
b/prawokultury/settings.d/50-static.conf
index
da9a583
..
2c42405
100755
(executable)
--- a/
prawokultury/settings.d/50-static.conf
+++ b/
prawokultury/settings.d/50-static.conf
@@
-28,6
+28,14
@@
PIPELINE_CSS = {
'output_filename': 'compressed/base.css',
},
}
'output_filename': 'compressed/base.css',
},
}
+PIPELINE_JS = {
+ 'base': {
+ 'source_filenames': (
+ 'js/promobox.js',
+ ),
+ 'output_filename': 'compressed/base.js',
+ },
+}
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',
PIPELINE_COMPILERS = (
'pipeline.compilers.sass.SASSCompiler',