Merge branch 'stable'
* stable: Fix some bugs introduced when the Sass monkey patch was removed. [Docs] Some polish for the new reset page.
This commit is contained in:
commit
0da025c78d
@ -1,6 +1,6 @@
|
||||
---
|
||||
title: Blueprint Reset
|
||||
crumb: Reset
|
||||
title: Blueprint Reset Utilities
|
||||
crumb: Reset Utilities
|
||||
framework: blueprint
|
||||
stylesheet: blueprint/reset/_utilities.scss
|
||||
layout: blueprint
|
||||
|
@ -42,7 +42,7 @@ module Compass
|
||||
def out_of_date?
|
||||
Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
|
||||
sass_files.zip(css_files).each do |sass_filename, css_filename|
|
||||
return sass_filename if Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
|
||||
return sass_filename if Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
|
||||
end
|
||||
false
|
||||
end
|
||||
@ -106,7 +106,7 @@ module Compass
|
||||
end
|
||||
|
||||
def should_compile?(sass_filename, css_filename)
|
||||
options[:force] || Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename)
|
||||
options[:force] || Sass::Plugin.send(:stylesheet_needs_update?, css_filename, sass_filename)
|
||||
end
|
||||
|
||||
# A sass engine for compiling a single file.
|
||||
|
@ -54,6 +54,8 @@ module Compass
|
||||
end
|
||||
|
||||
def configure_sass_plugin!
|
||||
return if sass_plugin_configured?
|
||||
require 'sass/plugin'
|
||||
@sass_plugin_configured = true
|
||||
config = sass_plugin_configuration
|
||||
locations = config.delete(:template_location)
|
||||
|
Loading…
Reference in New Issue
Block a user