fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tags wired to pictures
[wolnelektury.git]
/
wolnelektury
/
settings
/
static.py
diff --git
a/wolnelektury/settings/static.py
b/wolnelektury/settings/static.py
index
8d0e5be
..
b78340d
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,11
+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/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',
},
@@
-48,11
+48,16
@@
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',
},
+ 'picture': {
+ 'source_filenames': [
+ 'css/master.book.css',
+ 'css/master.picture.css',
+ ],
+ 'output_filename': 'css/compressed/picture.css',
+ },
'player': {
'source_filenames': [
'jplayer/jplayer.blue.monday.css',
'player': {
'source_filenames': [
'jplayer/jplayer.blue.monday.css',
@@
-86,8
+91,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',
},
@@
-105,9
+109,9
@@
PIPELINE_JS = {
'js/jquery.scrollto.js',
'js/jquery.highlightfade.js',
'js/book.js',
'js/jquery.scrollto.js',
'js/jquery.highlightfade.js',
'js/book.js',
+ 'js/picture.js',
'player/openplayer.js',
'player/openplayer.js',
-
- 'js/annoy.js',
+ 'js/progressSpin.min.js',
],
'output_filename': 'js/book.min.js',
},
],
'output_filename': 'js/book.min.js',
},
@@
-123,5
+127,7
@@
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
PIPELINE_COMPILERS = (
PIPELINE_JS_COMPRESSOR = None
PIPELINE_COMPILERS = (
- 'p
ipeline.compilers.sass.SA
SSCompiler',
+ 'p
yscss_compiler.PySC
SSCompiler',
)
)
+PIPELINE_PYSCSS_BINARY = '/usr/bin/env /home/staging/wolnelektury.pl/ve/bin/pyscss'
+PIPELINE_PYSCSS_ARGUMENTS = ''