fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There's some work on book page left.
[wolnelektury.git]
/
wolnelektury
/
settings
/
static.py
diff --git
a/wolnelektury/settings/static.py
b/wolnelektury/settings/static.py
index
e1e8594
..
e7cceed
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/"
@@
-14,33
+14,28
@@
MEDIA_URL = '/media/'
STATIC_URL = '/static/'
# CSS and JavaScript file groups
STATIC_URL = '/static/'
# CSS and JavaScript file groups
+
+
PIPELINE_CSS = {
PIPELINE_CSS = {
- '
all
': {
+ '
main
': {
# styles both for mobile and for big screen
'source_filenames': [
'css/jquery.countdown.css',
# 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',
'sponsors/css/sponsors.css',
- 'css/auth.css',
+ 'funding/funding.scss',
+ 'polls/polls.scss',
'css/social/shelf_tags.css',
'css/social/shelf_tags.css',
+
+ 'uni_form/uni-form.css',
+ 'uni_form/default.uni-form.css',
+
'css/ui-lightness/jquery-ui-1.8.16.custom.css',
],
'css/ui-lightness/jquery-ui-1.8.16.custom.css',
],
- 'output_filename': 'css/compressed/all.css',
- },
- 'ie': {
- 'source_filenames': [
- 'css/ie.css',
- ],
- 'output_filename': 'css/compressed/ie.css',
+ 'output_filename': 'css/compressed/main.css',
},
'book': {
'source_filenames': [
},
'book': {
'source_filenames': [
@@
-80,8
+75,10
@@
PIPELINE_JS = {
'pdcounter/pdcounter.js',
'sponsors/js/sponsors.js',
'player/openplayer.js',
'pdcounter/pdcounter.js',
'sponsors/js/sponsors.js',
'player/openplayer.js',
-
'js/search.js',
'js/search.js',
+ 'funding/funding.js',
+
+ 'uni_form/uni-form.js',
),
'output_filename': 'js/base.min.js',
},
),
'output_filename': 'js/base.min.js',
},
@@
-113,3
+110,9
@@
PIPELINE_JS = {
STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
PIPELINE_CSS_COMPRESSOR = None
PIPELINE_JS_COMPRESSOR = None
+
+PIPELINE_COMPILERS = (
+ 'pyscss_compiler.PySCSSCompiler',
+)
+PIPELINE_PYSCSS_BINARY = '/usr/bin/env pyscss'
+PIPELINE_PYSCSS_ARGUMENTS = ''