Merge branch 'master' of github.com:chriseppstein/compass

VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :state: beta
-:build: 4
+:build: 5

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
     

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]
     }

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