X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/28cb104054903726b0556222929f8f2e9941882d..7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03:/wolnelektury/settings/static.py?ds=inline diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py index 83de0da2c..e7cceed20 100644 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@ -1,5 +1,5 @@ from os import path -from settings.paths import PROJECT_DIR +from .paths import PROJECT_DIR # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" @@ -14,43 +14,32 @@ MEDIA_URL = '/media/' STATIC_URL = '/static/' # CSS and JavaScript file groups + + PIPELINE_CSS = { - 'all': { + 'main': { # styles both for mobile and for big screen 'source_filenames': [ 'css/jquery.countdown.css', - 'css/base.css', - 'css/cite.css', - 'css/header.css', - 'css/main_page.css', - 'css/dialogs.css', - 'css/picture_box.css', - 'css/book_box.css', - 'css/catalogue.css', + 'css/main/*.scss', + 'sponsors/css/sponsors.css', - 'css/auth.css', 'funding/funding.scss', - 'css/form.scss', + 'polls/polls.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', - }, - 'ie': { - 'source_filenames': [ - 'css/ie.css', + 'uni_form/uni-form.css', + 'uni_form/default.uni-form.css', + + 'css/ui-lightness/jquery-ui-1.8.16.custom.css', ], - 'output_filename': 'css/compressed/ie.css', + 'output_filename': 'css/compressed/main.css', }, 'book': { 'source_filenames': [ 'css/master.book.css', - - 'css/annoy.css', ], 'output_filename': 'css/compressed/book.css', }, @@ -87,8 +76,9 @@ PIPELINE_JS = { 'sponsors/js/sponsors.js', 'player/openplayer.js', 'js/search.js', - - 'js/annoy.js', + 'funding/funding.js', + + 'uni_form/uni-form.js', ), 'output_filename': 'js/base.min.js', }, @@ -107,8 +97,6 @@ PIPELINE_JS = { 'js/jquery.highlightfade.js', 'js/book.js', 'player/openplayer.js', - - 'js/annoy.js', ], 'output_filename': 'js/book.min.js', },