From 154a22406c4195d3d6ed231c6b8078382efe614f Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Fri, 3 Oct 2008 14:10:35 -0700 Subject: [PATCH] Incorrect framework nesting in the compass initializers. The frameworks scope themselves. --- lib/compass/commands/install_rails.rb | 2 +- lib/compass/merb.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/compass/commands/install_rails.rb b/lib/compass/commands/install_rails.rb index 6aed3f0c..d80b0cb1 100644 --- a/lib/compass/commands/install_rails.rb +++ b/lib/compass/commands/install_rails.rb @@ -44,7 +44,7 @@ Sass::Plugin.options[:template_location] = { "\#{RAILS_ROOT}#{File::SEPARATOR}#{options[:stylesheets_location]}" => "\#{RAILS_ROOT}#{File::SEPARATOR}#{options[:css_location]}" } Compass::Frameworks::ALL.each do |framework| - Sass::Plugin.options[:template_location][framework.stylesheets_directory] = "\#{RAILS_ROOT}#{File::SEPARATOR}public#{File::SEPARATOR}stylesheets#{File::SEPARATOR}#{options[:css_location]}#{File::SEPARATOR}\#{framework.name}" + Sass::Plugin.options[:template_location][framework.stylesheets_directory] = "\#{RAILS_ROOT}#{File::SEPARATOR}public#{File::SEPARATOR}stylesheets#{File::SEPARATOR}#{options[:css_location]}#{File::SEPARATOR}" end } end diff --git a/lib/compass/merb.rb b/lib/compass/merb.rb index 2a721b3b..b8ff84b0 100644 --- a/lib/compass/merb.rb +++ b/lib/compass/merb.rb @@ -35,7 +35,7 @@ Merb::BootLoader.after_app_loads do Merb::Config[:compass][:stylesheets] => Merb::Config[:compass][:compiled_stylesheets] } Compass::Frameworks::ALL.each do |framework| - template_location[framework.stylesheets_directory] = File.join(Merb::Config[:compass][:compiled_stylesheets], framework.name) + template_location[framework.stylesheets_directory] = Merb::Config[:compass][:compiled_stylesheets] end #configure Sass to know about all these sass locations.