Merge branch 'master' into funding

[wolnelektury.git] / wolnelektury / settings / static.py

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 2ed7b38..a3ff424 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -30,6 +30,9 @@ PIPELINE_CSS = {
             'css/catalogue.css',
             'sponsors/css/sponsors.css',
             'css/auth.css',
             'css/catalogue.css',
             'sponsors/css/sponsors.css',
             'css/auth.css',

+            'funding/funding.scss',
+            'polls/polls.scss',
+            'css/form.scss',

 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
             'css/social/shelf_tags.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',


@@ -81,6 +84,7 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',

+            'funding/funding.js',

             ),
         'output_filename': 'js/base.min.js',
     },
             ),
         'output_filename': 'js/base.min.js',
     },


@@ -112,3 +116,9 @@ PIPELINE_JS = {
 STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
 PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None

+
+PIPELINE_COMPILERS = (
+    'pyscss_compiler.PySCSSCompiler',
+)
+PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+PIPELINE_PYSCSS_ARGUMENTS = ''