From 6bd7f7c7f159d7c6e71fe32641fcdf8c750fbb73 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 15 May 2010 00:54:20 -0700 Subject: [PATCH 1/2] [Docs] Some polish for the new reset page. --- doc-src/content/reference/blueprint/reset/utilities.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc-src/content/reference/blueprint/reset/utilities.scss b/doc-src/content/reference/blueprint/reset/utilities.scss index 6a3a71fc..b495064b 100644 --- a/doc-src/content/reference/blueprint/reset/utilities.scss +++ b/doc-src/content/reference/blueprint/reset/utilities.scss @@ -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 From 942ea5f1b061306aad9f40ea3b44902c91d01c3f Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 15 May 2010 00:55:31 -0700 Subject: [PATCH 2/2] Fix some bugs introduced when the Sass monkey patch was removed. --- lib/compass/compiler.rb | 4 ++-- lib/compass/configuration/helpers.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/compass/compiler.rb b/lib/compass/compiler.rb index ed33b808..8971d461 100644 --- a/lib/compass/compiler.rb +++ b/lib/compass/compiler.rb @@ -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. diff --git a/lib/compass/configuration/helpers.rb b/lib/compass/configuration/helpers.rb index ea761389..c00c6937 100644 --- a/lib/compass/configuration/helpers.rb +++ b/lib/compass/configuration/helpers.rb @@ -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)