github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
* 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:
Chris Eppstein 2010-05-15 00:57:27 -07:00
commit 0da025c78d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc-src/content/reference/blueprint/reset/utilities.scss
View File

@ -1,6 +1,6 @@
--- ---
title: Blueprint Reset title: Blueprint Reset Utilities
crumb: Reset crumb: Reset Utilities
framework: blueprint framework: blueprint
stylesheet: blueprint/reset/_utilities.scss stylesheet: blueprint/reset/_utilities.scss
layout: blueprint layout: blueprint

4
lib/compass/compiler.rb
View File

@ -42,7 +42,7 @@ module Compass
def out_of_date? def out_of_date?
Compass.configure_sass_plugin! unless Compass.sass_plugin_configured? Compass.configure_sass_plugin! unless Compass.sass_plugin_configured?
sass_files.zip(css_files).each do |sass_filename, css_filename| 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 end
false false
end end
@ -106,7 +106,7 @@ module Compass
end end
def should_compile?(sass_filename, css_filename) 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 end
# A sass engine for compiling a single file. # A sass engine for compiling a single file.

2
lib/compass/configuration/helpers.rb
View File

@ -54,6 +54,8 @@ module Compass
end end
def configure_sass_plugin! def configure_sass_plugin!
return if sass_plugin_configured?
require 'sass/plugin'
@sass_plugin_configured = true @sass_plugin_configured = true
config = sass_plugin_configuration config = sass_plugin_configuration
locations = config.delete(:template_location) locations = config.delete(:template_location)