From 50aa936e02b99d1fe07b020b305339594422ac19 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 26 Jul 2009 15:57:32 -0700 Subject: [PATCH 1/7] [Rails] [Closes #32] Don't suggest creating a stylesheet link to partials. --- lib/compass/installers/rails.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/compass/installers/rails.rb b/lib/compass/installers/rails.rb index 3d920a51..9f2a3e36 100644 --- a/lib/compass/installers/rails.rb +++ b/lib/compass/installers/rails.rb @@ -117,6 +117,8 @@ Compass.configure_sass_plugin! def stylesheet_links html = "%head\n" manifest.each_stylesheet do |stylesheet| + # Skip partials. + next if File.basename(stylesheet.from)[0..0] == "_" ss_line = " = stylesheet_link_tag '#{stylesheet_prefix}#{stylesheet.to.sub(/\.sass$/,'.css')}'" if stylesheet.options[:media] ss_line += ", :media => '#{stylesheet.options[:media]}'" From c11be2eac6e7966ef65926dd53d0ee0d9928d8d8 Mon Sep 17 00:00:00 2001 From: "priit.mx.ee" Date: Sun, 26 Jul 2009 16:45:28 +0300 Subject: [PATCH 2/7] Ruby 1.9.1 fix: binding for parse_string --- lib/compass/configuration.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb index 8714420a..ae4f5b95 100644 --- a/lib/compass/configuration.rb +++ b/lib/compass/configuration.rb @@ -39,9 +39,10 @@ module Compass end def parse_string(contents, filename) - eval(contents, binding, filename) + bind = binding + eval(contents, bind, filename) ATTRIBUTES.each do |prop| - value = eval(prop.to_s, binding) rescue nil + value = eval(prop.to_s, bind) rescue nil self.send("#{prop}=", value) if value end if @added_import_paths From 7d47649248a9c6c92fbb7f6cd7adf95d0480d153 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 26 Jul 2009 16:00:14 -0700 Subject: [PATCH 3/7] Fix build failure in the RunCodeRun environment. --- test/command_line_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/command_line_test.rb b/test/command_line_test.rb index 6552c3be..8e621deb 100644 --- a/test/command_line_test.rb +++ b/test/command_line_test.rb @@ -19,7 +19,7 @@ class CommandLineTest < Test::Unit::TestCase def test_list_frameworks compass "--list-frameworks" - assert_equal("blueprint\ncompass\nyui\n", @last_result) + assert_equal(%w(blueprint compass yui), @last_result.split.sort) end def test_basic_install From 60ac9dba0eeff5325e6e0171a7b62359ca15e555 Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Fri, 17 Jul 2009 18:25:18 -0500 Subject: [PATCH 4/7] [Compass Core] Bug fix to sprites: fixed width and height assignments for x and y position variables --- .../stylesheets/compass/utilities/sprites/_sprite_img.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass b/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass index 5d46a53a..2381dbd4 100644 --- a/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass +++ b/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass @@ -4,8 +4,8 @@ // Simplest use: +sprite-img("icons-32.png", 1) =sprite-img(!img, !col, !row = 1, !width = !sprite_image_default_width, !height = !sprite_image_default_height, !margin = !sprite_image_default_margin) - !x = ((!col - 1) * -!height) - ((!col - 1) * !margin) - !y = ((!row - 1) * -!width) - ((!row - 1) * !margin) + !x = ((!col - 1) * -!width) - ((!col - 1) * !margin) + !y = ((!row - 1) * -!height) - ((!row - 1) * !margin) :background= image_url(!img) "no-repeat" !x !y :width= !width :height= !height From c3ecd5ac4b4abdd06fc6a2c2ab15302728457d0f Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 22 Aug 2009 08:28:24 -0700 Subject: [PATCH 5/7] Version bump to 0.8.11 --- VERSION.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.yml b/VERSION.yml index d0062a44..533f9f09 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,4 +1,4 @@ --- -:patch: 10 +:patch: 11 :major: 0 :minor: 8 From fbda9944793fa5cf0fc0d53a5205ddfee05d5ab0 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 22 Aug 2009 08:31:56 -0700 Subject: [PATCH 6/7] Updated the CHANGELOG for the 0.8.11 release. --- CHANGELOG.markdown | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 2c3b6f2a..2d4a2859 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,5 +1,16 @@ COMPASS CHANGELOG ================= + +0.8.11 (August 22, 2009) +------------------------ + +Bug Fix Release: + +* [Compass Core] Bug fix to sprites: fixed width and height assignments for x and y position variables +* Ruby 1.9.1 fix: binding for parse_string +* [Rails] Don't suggest creating a stylesheet link to partials. + + 0.8.10 (August 16, 2009) ------------------------ Bug Fix Release: From a4c656b82e835d81490efd3328e13a86ba471c69 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 22 Aug 2009 08:32:15 -0700 Subject: [PATCH 7/7] Record current revision for release. --- REVISION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REVISION b/REVISION index 91b96d9c..a548f5cf 100644 --- a/REVISION +++ b/REVISION @@ -1 +1 @@ -0492fc99695bf8ec64cb64ca41b7451db9e01fcb \ No newline at end of file +fbda9944793fa5cf0fc0d53a5205ddfee05d5ab0 \ No newline at end of file