dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes based on @mattr-'s notes

This commit is contained in:
Parker Moore 2014-01-24 12:19:19 -05:00
parent 774bf96c61
commit c9a3c40f83
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/converters/sass.rb
View File

@ -11,12 +11,12 @@ module Jekyll
".css" ".css"
end end
def user_sass_configs def jekyll_sass_configuration
@config["sass"] || {} @config["sass"] || {}
end end
def sass_build_configuration_options(overrides) def sass_build_configuration_options(overrides)
user_sass_configs.deep_merge(overrides).symbolize_keys jekyll_sass_configuration.deep_merge(overrides).symbolize_keys
end end
def syntax_type_of_content(content) def syntax_type_of_content(content)
@ -28,13 +28,14 @@ module Jekyll
end end
def sass_dir def sass_dir
user_sass_configs["sass_dir"] || "_sass" return "_sass" if jekyll_sass_configuration["sass_dir"].to_s.empty?
jekyll_sass_configuration["sass_dir"]
end end
def sass_dir_relative_to_site_source def sass_dir_relative_to_site_source
File.join( File.join(
@config["source"], @config["source"],
File.expand_path(sass_dir, "/") File.expand_path(sass_dir, "/") # FIXME: Not windows-compatible
) )
end end