From 199e418d01a16ac4c0503de8a872dacaaa672ba4 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Wed, 14 Mar 2012 19:34:47 -0700 Subject: [PATCH] Use http_generated_images_path with Compass 0.12.x --- lib/middleman/core_extensions/compass.rb | 9 +++++++++ middleman-x86-mingw32.gemspec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/middleman/core_extensions/compass.rb b/lib/middleman/core_extensions/compass.rb index 0a11fd0f..08fc1063 100644 --- a/lib/middleman/core_extensions/compass.rb +++ b/lib/middleman/core_extensions/compass.rb @@ -47,6 +47,15 @@ module Middleman::CoreExtensions::Compass File.join(app.http_prefix || "/", app.images_dir) end + # Correctly support HTTP paths with generated sprites + if config.respond_to? :http_generated_images_path + config.http_generated_images_path = if app.respond_to? :http_generated_images_path + app.http_generated_images_path + else + File.join(app.http_prefix || "/", app.images_dir) + end + end + config.http_stylesheets_path = if app.respond_to? :http_css_path app.http_css_path else diff --git a/middleman-x86-mingw32.gemspec b/middleman-x86-mingw32.gemspec index 749bbdc6..6620b125 100644 --- a/middleman-x86-mingw32.gemspec +++ b/middleman-x86-mingw32.gemspec @@ -47,8 +47,8 @@ eos s.add_dependency("uglifier", ["~> 1.0.0"]) s.add_dependency("slim", ["~> 1.0.2"]) s.add_dependency("haml", ["~> 3.1.0"]) - s.add_dependency("sass", ["~> 3.1.7"]) - s.add_dependency("compass", ["~> 0.11.3"]) + s.add_dependency("sass", [">= 3.1.7"]) + s.add_dependency("compass", ["~> 0.11"]) s.add_dependency("coffee-script", ["~> 2.2.0"]) s.add_dependency("sprockets", ["~> 2.0.3"]) s.add_dependency("padrino-core", ["~> 0.10.5"])