master
Nick Sergeant 2012-04-08 19:15:11 -04:00
parent 3385da344a
commit b594a8f12d
2 changed files with 5 additions and 1 deletions

View File

@ -225,10 +225,14 @@ if not DEBUG:
# CSS / JS Compression # CSS / JS Compression
COMPRESS_OUTPUT_DIR = 'cache' COMPRESS_OUTPUT_DIR = 'cache'
COMPRESS_JS_FILTERS = [] COMPRESS_JS_FILTERS = []
COMPRESS_ENABLED = True
if DEBUG: if DEBUG:
COMPRESS_ROOT = os.path.join(BASE_PATH, 'media') COMPRESS_ROOT = os.path.join(BASE_PATH, 'media')
else: else:
COMPRESS_ROOT = STATIC_ROOT COMPRESS_ROOT = STATIC_ROOT
COMPRESS_PRECOMPILERS = (
('text/x-scss', 'sass --scss {infile} {outfile}'),
)
# Extensions # Extensions
if DEBUG: if DEBUG:

View File

@ -11,7 +11,7 @@
{% compress css %} {% compress css %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" /> <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/style.css" /> <link rel="stylesheet" type="text/x-scss" href="{{ STATIC_URL }}css/style.scss" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/themes.css" /> <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/themes.css" />
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/chosen.css" /> <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/chosen.css" />
{% endcompress %} {% endcompress %}