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

Always pretend we no nothing about the build folder. Fixes #283

Browse source
This commit is contained in:
Thomas Reynolds 2012-03-03 15:49:49 -08:00
parent e285045fc5
commit 332a503460
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,12 +34,12 @@ module Middleman::CoreExtensions::Compass
end end
end end
if build? # if build?
::Compass.configuration do |config| # ::Compass.configuration do |config|
config.environment = :production # config.environment = :production
config.project_path = File.join(root, build_dir) # config.project_path = File.join(root, build_dir)
end # end
end # end
run_hook :compass_config, ::Compass.configuration run_hook :compass_config, ::Compass.configuration
run_hook :after_compass_config run_hook :after_compass_config

6
middleman-more/lib/middleman-more/renderers/sass.rb
View file

@ -40,11 +40,7 @@ module Middleman::Renderers::Sass
# Change Sass path, for url functions, to the build folder if we're building # Change Sass path, for url functions, to the build folder if we're building
# @return [Hash] # @return [Hash]
def sass_options def sass_options
location_of_sass_file = if @context.build? location_of_sass_file = File.expand_path(@context.source, @context.root)
File.expand_path(@context.build_dir, @context.root)
else
File.expand_path(@context.source, @context.root)
end
parts = basename.split('.') parts = basename.split('.')
parts.pop parts.pop