From d579c8bdcbf453cc0bde617c5ff0ebc2390b3b40 Mon Sep 17 00:00:00 2001 From: Scott Davis Date: Sat, 26 Mar 2011 15:25:47 -0400 Subject: [PATCH 1/7] 5 not 50 --- lib/compass/sass_extensions/sprites/sprites.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/sass_extensions/sprites/sprites.rb b/lib/compass/sass_extensions/sprites/sprites.rb index c32ae4fc..59992153 100644 --- a/lib/compass/sass_extensions/sprites/sprites.rb +++ b/lib/compass/sass_extensions/sprites/sprites.rb @@ -17,7 +17,7 @@ module Compass end def self.load_map(uri, options) - Compass.quick_cache("spritemap:#{uri}", 50) do + Compass.quick_cache("spritemap:#{uri}", 5) do SpriteMap.new(uri, options) end end From 411cdb7c2cf5acf8e206ab2060fa570fd6f4245f Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 26 Mar 2011 12:36:03 -0700 Subject: [PATCH 2/7] Version Bump. --- VERSION.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.yml b/VERSION.yml index 927d5311..7dd62e62 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -2,4 +2,4 @@ :major: 0 :minor: 11 :state: beta -:build: 4 +:build: 5 From b91e669050374af2c815b14e8fd6c0776cacc0dd Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 27 Mar 2011 19:16:28 -0700 Subject: [PATCH 3/7] Some links on the sprites reference page to related spriting resources. --- .../content/reference/compass/utilities/sprites.haml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc-src/content/reference/compass/utilities/sprites.haml b/doc-src/content/reference/compass/utilities/sprites.haml index 5b1bd949..25202a24 100644 --- a/doc-src/content/reference/compass/utilities/sprites.haml +++ b/doc-src/content/reference/compass/utilities/sprites.haml @@ -11,5 +11,13 @@ classnames: - core - utilities --- -= render 'reference' +- render 'reference' do + %h3 Additional Resources + %ul + %li + %a(href="/help/tutorials/spriting/") Spriting Tutorial + %li + %a(href="/reference/compass/helpers/sprites/") Sprite Helpers + %li + %a(href="/reference/compass/utilities/sprites/base/") Base Stylesheet \ No newline at end of file From a7b8689fb895d1786c5cabda6f5008572386b5a2 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 27 Mar 2011 19:16:59 -0700 Subject: [PATCH 4/7] Fix bug in the compact function. --- lib/compass/sass_extensions/functions/lists.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/compass/sass_extensions/functions/lists.rb b/lib/compass/sass_extensions/functions/lists.rb index e82a6757..a9e15a0c 100644 --- a/lib/compass/sass_extensions/functions/lists.rb +++ b/lib/compass/sass_extensions/functions/lists.rb @@ -18,8 +18,9 @@ module Compass::SassExtensions::Functions::Lists def compact(*args) sep = :comma if args.size == 1 && args.first.is_a?(Sass::Script::List) - args = args.first.value - sep = args.first.separator + list = args.first + args = list.value + sep = list.separator end Sass::Script::List.new(args.reject{|a| !a.to_bool}, sep) end From 119ce9d018ef25bf08531114ce22307306dfc212 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 27 Mar 2011 21:03:14 -0700 Subject: [PATCH 5/7] Don't output transparent in css2 ouput. Closes GH-309 --- .../monkey_patches/browser_support.rb | 18 ++++++++++++++++++ test/sass_extensions_test.rb | 1 + 2 files changed, 19 insertions(+) diff --git a/lib/compass/sass_extensions/monkey_patches/browser_support.rb b/lib/compass/sass_extensions/monkey_patches/browser_support.rb index 6dfa63d8..95d8997e 100644 --- a/lib/compass/sass_extensions/monkey_patches/browser_support.rb +++ b/lib/compass/sass_extensions/monkey_patches/browser_support.rb @@ -92,4 +92,22 @@ module Sass::Script end end + class String < Literal + def supports?(aspect) + aspect == "css2" && value == "transparent" && type == :identifier + end + + def has_aspect? + true + end + + def to_css2(options = self.options) + if value == "transparent" && type == :identifier + Sass::Script::String.new("") + else + dup + end + end + end + end diff --git a/test/sass_extensions_test.rb b/test/sass_extensions_test.rb index cbd75f8a..3d129d87 100644 --- a/test/sass_extensions_test.rb +++ b/test/sass_extensions_test.rb @@ -87,6 +87,7 @@ class SassExtensionsTest < Test::Unit::TestCase assert_equal "true", evaluate("blank('')") assert_equal "true", evaluate("blank(' ')") assert_equal "true", evaluate("blank(-compass-space-list(' '))") + assert_equal " ", evaluate("-css2(transparent linear-gradient(#fff,#000))") end protected From 2521d4dd7bffbbc1ccc88b636715e8413de3dd0a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 27 Mar 2011 21:16:29 -0700 Subject: [PATCH 6/7] Fix broken links in the search results page. --- doc-src/lib/search.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc-src/lib/search.rb b/doc-src/lib/search.rb index aadde495..f5f5d47b 100644 --- a/doc-src/lib/search.rb +++ b/doc-src/lib/search.rb @@ -66,7 +66,7 @@ def search_index # puts "Indexed: #{term}" end idx["items"][id] = { - "url" => "/docs#{item.identifier}", + "url" => "#{item.identifier}", "title" => item[:title], "crumb" => item[:crumb] } From ccb391d9d1948740950ce402b9907a6e83f15733 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 28 Mar 2011 09:29:38 -0700 Subject: [PATCH 7/7] Revert "Don't output transparent in css2 ouput." Transparent is a legal value in css2. This reverts commit 119ce9d018ef25bf08531114ce22307306dfc212. --- .../monkey_patches/browser_support.rb | 18 ------------------ test/sass_extensions_test.rb | 1 - 2 files changed, 19 deletions(-) diff --git a/lib/compass/sass_extensions/monkey_patches/browser_support.rb b/lib/compass/sass_extensions/monkey_patches/browser_support.rb index 95d8997e..6dfa63d8 100644 --- a/lib/compass/sass_extensions/monkey_patches/browser_support.rb +++ b/lib/compass/sass_extensions/monkey_patches/browser_support.rb @@ -92,22 +92,4 @@ module Sass::Script end end - class String < Literal - def supports?(aspect) - aspect == "css2" && value == "transparent" && type == :identifier - end - - def has_aspect? - true - end - - def to_css2(options = self.options) - if value == "transparent" && type == :identifier - Sass::Script::String.new("") - else - dup - end - end - end - end diff --git a/test/sass_extensions_test.rb b/test/sass_extensions_test.rb index 3d129d87..cbd75f8a 100644 --- a/test/sass_extensions_test.rb +++ b/test/sass_extensions_test.rb @@ -87,7 +87,6 @@ class SassExtensionsTest < Test::Unit::TestCase assert_equal "true", evaluate("blank('')") assert_equal "true", evaluate("blank(' ')") assert_equal "true", evaluate("blank(-compass-space-list(' '))") - assert_equal " ", evaluate("-css2(transparent linear-gradient(#fff,#000))") end protected