diff --git a/lib/middleman/core_extensions/compass.rb b/lib/middleman/core_extensions/compass.rb index 93f24640..97839645 100644 --- a/lib/middleman/core_extensions/compass.rb +++ b/lib/middleman/core_extensions/compass.rb @@ -27,17 +27,16 @@ module Middleman::CoreExtensions::Compass end ::Compass.configuration do |config| - views_root = File.basename(app.views) - - config.project_path = views_root + config.project_path = app.root config.environment = :development config.cache_path = File.join(app.root, ".sass-cache") - 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 + 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.http_images_path = if app.respond_to? :http_images_path app.http_images_path diff --git a/lib/middleman/features/relative_assets.rb b/lib/middleman/features/relative_assets.rb index 40b19159..b2037082 100755 --- a/lib/middleman/features/relative_assets.rb +++ b/lib/middleman/features/relative_assets.rb @@ -1,7 +1,9 @@ module Middleman::Features::RelativeAssets class << self def registered(app) - ::Compass.configuration.relative_assets = true + app.compass_config do |config| + config.relative_assets = true + end app.register_asset_handler :relative_assets do |path, prefix, request| begin diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index afa61678..2433ce05 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "2.0.0.rc91" + VERSION = "2.0.0.rc92" end