Merge remote-tracking branch 'zawadzki/new-design'

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

diff --git a/src/wolnelektury/settings/static.py b/src/wolnelektury/settings/static.py
index f98d7ee..b7beb79 100644 (file)
--- a/src/wolnelektury/settings/static.py
+++ b/src/wolnelektury/settings/static.py
@@ -22,35 +22,47 @@ IMAGE_DIR = 'book/pictures/'
 
 PIPELINE = {
     'STYLESHEETS': {
 
 PIPELINE = {
     'STYLESHEETS': {

+        '2021': {
+            'source_filenames': [
+                '2021/css/main.scss',
+            ],
+            'output_filename': 'css/compressed/2021.css',
+        },

         'main': {
             # styles both for mobile and for big screen
             'source_filenames': [
         'main': {
             # styles both for mobile and for big screen
             'source_filenames': [

+                'css/import/gelasio.css',
+

                 'css/jquery.countdown.css',
                 'jplayer/jplayer.blue.monday.css',
 
                 'sponsors/css/sponsors.css',
 
                 'css/jquery.countdown.css',
                 'jplayer/jplayer.blue.monday.css',
 
                 'sponsors/css/sponsors.css',
 

-                'css/annoy.css',
+                'annoy/banner.scss',

 
                 'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
                 'css/tlite.css',
 
                 'scss/main.scss',
 
                 'css/ui-lightness/jquery-ui-1.8.16.custom.css',
 
                 'css/tlite.css',
 
                 'scss/main.scss',

+                'club/club.scss',

             ],
             'output_filename': 'css/compressed/main.css',
         },
         'book': {
             'source_filenames': [
             ],
             'output_filename': 'css/compressed/main.css',
         },
         'book': {
             'source_filenames': [

+                'css/import/gelasio.css',

                 'css/master.book.css',
             ],
             'output_filename': 'css/compressed/book.css',
         },
         'book_text': {
             'source_filenames': [
                 'css/master.book.css',
             ],
             'output_filename': 'css/compressed/book.css',
         },
         'book_text': {
             'source_filenames': [

+                'css/import/gelasio.css',

                 'scss/book_text.scss',
                 'css/new.book.css',
                 'scss/book_text.scss',
                 'css/new.book.css',

-                'css/annoy.css',
+                'annoy/banner.scss',
+                'annoy/book_text.scss',

 
                 'css/master.picture.css',
             ],
 
                 'css/master.picture.css',
             ],


@@ -64,6 +76,7 @@ PIPELINE = {
         },
         'picture': {
             'source_filenames': [
         },
         'picture': {
             'source_filenames': [

+                'css/import/gelasio.css',

                 'css/master.book.css',
                 'css/master.picture.css',
             ],
                 'css/master.book.css',
                 'css/master.picture.css',
             ],


@@ -116,7 +129,7 @@ PIPELINE = {
                 'funding/funding.js',
                 'club/form.js',
 
                 'funding/funding.js',
                 'club/form.js',
 

-                'js/annoy.js',
+                'annoy/banner.js',

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


@@ -144,21 +157,24 @@ PIPELINE = {
         },
         'book_text': {
             'source_filenames': [
         },
         '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',
                 'js/book_text/menu.js',
                 'js/book_text/note.js',
                 'js/contrib/jquery.form.js',
                 'js/contrib/jquery.jqmodal.js',
                 'js/book_text/info.js',
                 'js/book_text/menu.js',
                 'js/book_text/note.js',

+                'js/book_text/references.js',

                 'js/book_text/settings.js',
                 'js/book_text/toc.js',
                 'js/locale.js',
                 'js/dialogs.js',
                 'js/book_text/settings.js',
                 '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/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',
         },
             ],
             'output_filename': 'js/book_text.js',
         },