Merge branch 'master' into funding

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

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 4e104c4..a3ff424 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -30,11 +30,12 @@ PIPELINE_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/annoy.css',
         ],
         'output_filename': 'css/compressed/all.css',
     },
@@ -47,8 +48,6 @@ PIPELINE_CSS = {
     'book': {
         'source_filenames': [
             'css/master.book.css',
-
-            'css/annoy.css',
         ],
         'output_filename': 'css/compressed/book.css',
     },
@@ -85,8 +84,7 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',
-
-            'js/annoy.js',
+            'funding/funding.js',
             ),
         'output_filename': 'js/base.min.js',
     },
@@ -105,8 +103,6 @@ PIPELINE_JS = {
             'js/jquery.highlightfade.js',
             'js/book.js',
             'player/openplayer.js',
-
-            'js/annoy.js',
         ],
         'output_filename': 'js/book.min.js',
     },
@@ -120,3 +116,9 @@ PIPELINE_JS = {
 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 = ''