Merge branch 'master' into funding

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

diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py
index 83de0da..a3ff424 100644 (file)
--- a/wolnelektury/settings/static.py
+++ b/wolnelektury/settings/static.py
@@ -1,5 +1,5 @@
 from os import path
 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/"
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"


@@ -31,12 +31,11 @@ PIPELINE_CSS = {
             'sponsors/css/sponsors.css',
             'css/auth.css',
             'funding/funding.scss',
             '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/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',
     },
         ],
         'output_filename': 'css/compressed/all.css',
     },


@@ -49,8 +48,6 @@ PIPELINE_CSS = {
     'book': {
         'source_filenames': [
             'css/master.book.css',
     'book': {
         'source_filenames': [
             'css/master.book.css',

-
-            'css/annoy.css',

         ],
         'output_filename': 'css/compressed/book.css',
     },
         ],
         'output_filename': 'css/compressed/book.css',
     },


@@ -87,8 +84,7 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',
             'sponsors/js/sponsors.js',
             'player/openplayer.js',
             'js/search.js',

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

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


@@ -107,8 +103,6 @@ PIPELINE_JS = {
             'js/jquery.highlightfade.js',
             'js/book.js',
             'player/openplayer.js',
             'js/jquery.highlightfade.js',
             'js/book.js',
             'player/openplayer.js',

-
-            'js/annoy.js',

         ],
         'output_filename': 'js/book.min.js',
     },
         ],
         'output_filename': 'js/book.min.js',
     },