From 08cf376eac67e8da2b0cbfa423e0f1fbde39aa97 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 26 Jul 2011 13:29:41 -0700 Subject: [PATCH] fix some compass config --- lib/middleman/core_extensions/compass.rb | 39 ++++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/middleman/core_extensions/compass.rb b/lib/middleman/core_extensions/compass.rb index ad753a20..93f24640 100644 --- a/lib/middleman/core_extensions/compass.rb +++ b/lib/middleman/core_extensions/compass.rb @@ -27,27 +27,40 @@ module Middleman::CoreExtensions::Compass end ::Compass.configuration do |config| - config.project_path = app.root + views_root = File.basename(app.views) + + config.project_path = views_root config.environment = :development config.cache_path = File.join(app.root, ".sass-cache") - views_root = File.basename(app.views) - config.sass_dir = File.join(views_root, app.css_dir) - config.css_dir = File.join(views_root, app.css_dir) - config.javascripts_dir = File.join(views_root, app.js_dir) - config.fonts_dir = File.join(views_root, app.fonts_dir) - config.images_dir = File.join(views_root, app.images_dir) + config.sass_dir = app.css_dir + config.css_dir = app.css_dir + config.javascripts_dir = app.js_dir + config.fonts_dir = app.fonts_dir + config.images_dir = app.images_dir - if app.respond_to? :http_images_path - config.http_images_path = app.http_images_path + config.http_images_path = if app.respond_to? :http_images_path + app.http_images_path + else + File.join(app.http_prefix || "/", app.images_dir) end - if app.respond_to? :http_css_path - config.http_stylesheets_path = app.http_css_path + config.http_stylesheets_path = if app.respond_to? :http_css_path + app.http_css_path + else + File.join(app.http_prefix || "/", app.css_dir) end - if app.respond_to? :http_js_path - config.http_javascripts_path = app.http_js_path + config.http_javascripts_path = if app.respond_to? :http_js_path + app.http_js_path + else + File.join(app.http_prefix || "/", app.js_dir) + end + + config.http_javascripts_path = if app.respond_to? :http_fonts_path + app.http_js_path + else + File.join(app.http_prefix || "/", app.fonts_dir) end config.asset_cache_buster :none