deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #469 from danielbayerlein/fix-compass-config

Browse source 
Can not start the middleman server when i use the latest version of Compass (0.12.2.rc.1)
This commit is contained in:
Ben Hollis 2012-06-10 14:23:50 -07:00
commit 2e5ae051e6
2 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/application.rb
View file

@ -105,6 +105,10 @@ module Middleman
# @return [String]
set :images_dir, "images"
# Location of fonts within source. Used by Compass.
# @return [String]
set :fonts_dir, "fonts"
# Where to build output files
# @return [String]
set :build_dir, "build"

5
middleman-more/lib/middleman-more/core_extensions/compass.rb
View file

@ -13,9 +13,6 @@ module Middleman
# Require the library
require "compass"
# Where to look for fonts
app.set :fonts_dir, "fonts"
# Hooks to manually update the compass config after we're
# done with it
app.define_hook :compass_config
@ -76,7 +73,7 @@ module Middleman
end
end
class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
class CompassScssTemplate < ::Middleman::Renderers::Sass::ScssPlusCSSFilenameTemplate
private
def sass_options
super.merge(::Compass.configuration.to_sass_engine_options)