From fe4f7bb2e391bf7e0d9cb16d1cfd1696edcd4c0c Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 18 May 2012 17:00:43 -0400 Subject: [PATCH] Compress sass and js, except in dev environments --- envs/common.py | 5 ++++- envs/dev.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/envs/common.py b/envs/common.py index 1eaecc3228..e24e4dca6f 100644 --- a/envs/common.py +++ b/envs/common.py @@ -300,9 +300,10 @@ PIPELINE_COMPILERS = [ 'pipeline.compilers.coffee.CoffeeScriptCompiler', ] -PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT) +PIPELINE_SASS_ARGUMENTS = '-t compressed -r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT) PIPELINE_CSS_COMPRESSOR = None +PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yui.YUICompressor' STATICFILES_IGNORE_PATTERNS = ( "sass/*", @@ -311,6 +312,8 @@ STATICFILES_IGNORE_PATTERNS = ( "*.pyc" ) +PIPELINE_YUI_BINARY = '/usr/bin/yui-compressor' + ################################### APPS ####################################### INSTALLED_APPS = ( # Standard ones that are always installed... diff --git a/envs/dev.py b/envs/dev.py index e07bca3ece..3793330d08 100644 --- a/envs/dev.py +++ b/envs/dev.py @@ -85,5 +85,4 @@ FILE_UPLOAD_HANDLERS = ( ########################### PIPELINE ################################# PIPELINE_COFFEE_SCRIPT_BINARY = 'coffee' -PIPELINE_JS_COMPRESSOR = None -PIPELINE_CSS_COMPRESSOR = None +PIPELINE_SASS_ARGUMENTS = '-r {proj_dir}/static/sass/bourbon/lib/bourbon.rb'.format(proj_dir=PROJECT_ROOT)