Incorrect framework nesting in the compass initializers. The frameworks scope themselves.
This commit is contained in:
parent
2189e28c65
commit
154a22406c
@ -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
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user