fix some idiotic compass bugs
This commit is contained in:
parent
08cf376eac
commit
ff36d1ff6a
|
@ -27,17 +27,16 @@ module Middleman::CoreExtensions::Compass
|
||||||
end
|
end
|
||||||
|
|
||||||
::Compass.configuration do |config|
|
::Compass.configuration do |config|
|
||||||
views_root = File.basename(app.views)
|
config.project_path = app.root
|
||||||
|
|
||||||
config.project_path = views_root
|
|
||||||
config.environment = :development
|
config.environment = :development
|
||||||
config.cache_path = File.join(app.root, ".sass-cache")
|
config.cache_path = File.join(app.root, ".sass-cache")
|
||||||
|
|
||||||
config.sass_dir = app.css_dir
|
views_root = File.basename(app.views)
|
||||||
config.css_dir = app.css_dir
|
config.sass_dir = File.join(views_root, app.css_dir)
|
||||||
config.javascripts_dir = app.js_dir
|
config.css_dir = File.join(views_root, app.css_dir)
|
||||||
config.fonts_dir = app.fonts_dir
|
config.javascripts_dir = File.join(views_root, app.js_dir)
|
||||||
config.images_dir = app.images_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
|
config.http_images_path = if app.respond_to? :http_images_path
|
||||||
app.http_images_path
|
app.http_images_path
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
module Middleman::Features::RelativeAssets
|
module Middleman::Features::RelativeAssets
|
||||||
class << self
|
class << self
|
||||||
def registered(app)
|
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|
|
app.register_asset_handler :relative_assets do |path, prefix, request|
|
||||||
begin
|
begin
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
module Middleman
|
module Middleman
|
||||||
VERSION = "2.0.0.rc91"
|
VERSION = "2.0.0.rc92"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue