X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9a7603cfbfdf7c0b4a2210ef454cecf894c5e172..1aa94794c14bd4d64474f146963dd4550e79d516:/wolnelektury/settings/static.py

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 9cdc60b2d..fd99d38b7 100644
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -30,7 +30,7 @@ PIPELINE_CSS = {
 
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
-            'scss/all.scss',
+            'scss/main.scss',
         ],
         'output_filename': 'css/compressed/main.css',
     },
@@ -40,6 +40,13 @@ PIPELINE_CSS = {
         ],
         'output_filename': 'css/compressed/book.css',
     },
+    'book_text': {
+        'source_filenames': [
+            'scss/book_text.scss',
+            'css/new.book.css',
+        ],
+        'output_filename': 'css/compressed/book_text.css',
+    },
     'player': {
         'source_filenames': [
             'jplayer/jplayer.blue.monday.css', 
@@ -92,11 +99,22 @@ PIPELINE_JS = {
             'js/jquery.eventdelegation.js',
             'js/jquery.scrollto.js',
             'js/jquery.highlightfade.js',
+            'js/book_text/other.js',
             'js/book.js',
             'player/openplayer.js',
         ],
         'output_filename': 'js/book.min.js',
     },
+    'book_text': {
+        'source_filenames': [
+            'js/jquery.form.js',
+            'js/jquery.jqmodal.js',
+            'js/book_text/*.js',
+            'js/locale.js',
+            'js/dialogs.js',
+        ],
+        'output_filename': 'js/book_text.js',
+    },
     'book_ie': {
         'source_filenames': ('js/ierange-m2.js',),
         'output_filename': 'js/book_ie.min.js',
@@ -109,7 +127,12 @@ PIPELINE_CSS_COMPRESSOR = None
 PIPELINE_JS_COMPRESSOR = None
 
 PIPELINE_COMPILERS = (
-    'pyscss_compiler.PySCSSCompiler',
+    'pipeline.compilers.sass.SASSCompiler',
+    # We could probably use PySCSS instead,
+    # but they have some serious problems, like:
+    # https://github.com/Kronuz/pyScss/issues/166 (empty list syntax)
+    # https://github.com/Kronuz/pyScss/issues/258 (bad @media order)
+    #'pyscss_compiler.PySCSSCompiler',
 )
-PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
-PIPELINE_PYSCSS_ARGUMENTS = ''
+#PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+#PIPELINE_PYSCSS_ARGUMENTS = ''