X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6d42bc478e3d1bd90eb294464748c21e4de0fc63..1b80c204be885588f7cbe95610e3677f2f886801:/src/wolnelektury/settings/static.py?ds=sidebyside diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py index 6cf76662d..bfffb820e 100644 --- a/src/wolnelektury/settings/static.py +++ b/src/wolnelektury/settings/static.py @@ -30,7 +30,7 @@ PIPELINE = { 'sponsors/css/sponsors.css', - 'css/annoy.css', + 'annoy/banner.scss', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', @@ -50,12 +50,19 @@ PIPELINE = { 'source_filenames': [ 'scss/book_text.scss', 'css/new.book.css', - 'css/annoy.css', + 'annoy/banner.scss', + 'annoy/book_text.scss', 'css/master.picture.css', ], 'output_filename': 'css/compressed/book_text.css', }, + 'forum': { + 'source_filenames': [ + 'scss/forum.scss', + ], + 'output_filename': 'css/compressed/compressed/forum.css', + }, 'picture': { 'source_filenames': [ 'css/master.book.css', @@ -110,7 +117,7 @@ PIPELINE = { 'funding/funding.js', 'club/form.js', - 'js/annoy.js', + 'annoy/banner.js', ), 'output_filename': 'js/base.min.js', }, @@ -138,6 +145,7 @@ PIPELINE = { }, 'book_text': { 'source_filenames': [ + 'js/contrib/jquery.cycle2.min.js', 'js/contrib/jquery.form.js', 'js/contrib/jquery.jqmodal.js', 'js/book_text/info.js', @@ -147,12 +155,13 @@ PIPELINE = { 'js/book_text/toc.js', 'js/locale.js', 'js/dialogs.js', + 'annoy/book_text.js', 'js/contrib/jquery.highlightfade.js', 'js/contrib/raphael-min.js', 'player/openplayer.js', 'js/contrib/progressSpin.min.js', - 'js/annoy.js', + 'annoy/banner.js', ], 'output_filename': 'js/book_text.js', }, @@ -179,12 +188,7 @@ PIPELINE = { 'CSS_COMPRESSOR': None, 'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor', 'COMPILERS': ( - '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', + 'libsasscompiler.LibSassCompiler', ) }