Merge remote branch 'chris/docs' into docs

Conflicts:
	doc-src/content/examples/compass/css3/columns/stylesheet.sass

doc-src/content/examples/compass/css3/columns/stylesheet.sass

@@ -14,4 +14,4 @@
   +column-count(4)
   +column-rule(1px, "solid", red)
   width: 300px
-  margin-bottom: 20px
+  margin-bottom: 20px

doc-src/content/reference/blueprint/fancy_type.haml

@@ -1,6 +1,6 @@
 --- 
-title: Blueprint Fancy_type
+title: Blueprint Fancy Type
-crumb: Fancy_type
+crumb: Fancy Type
 framework: blueprint
 stylesheet: blueprint/_fancy_type.sass
 classnames:

doc-src/content/reference/blueprint/link_icons.haml

@@ -1,6 +1,6 @@
 --- 
-title: Blueprint Link_icons
+title: Blueprint Link Icons
-crumb: Link_icons
+crumb: Link Icons
 framework: blueprint
 stylesheet: blueprint/_link_icons.sass
 classnames:

doc-src/content/reference/compass.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Compass
+title: Compass Core Framework
-crumb: Compass
+crumb: Compass Core
 framework: compass
 stylesheet: _compass.sass
 classnames:

doc-src/content/reference/compass/css3/background_clip.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Background_clip
+title: Compass Background Clip
-crumb: Background_clip
+crumb: Background Clip
 framework: compass
 stylesheet: compass/css3/_background_clip.sass
 classnames:

doc-src/content/reference/compass/css3/background_origin.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Background_origin
+title: Compass Background Origin
-crumb: Background_origin
+crumb: Background Origin
 framework: compass
 stylesheet: compass/css3/_background_origin.sass
 classnames:

doc-src/content/reference/compass/css3/background_size.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Background_size
+title: Compass Background Size
-crumb: Background_size
+crumb: Background Size
 framework: compass
 stylesheet: compass/css3/_background_size.sass
 classnames:

doc-src/content/reference/compass/css3/border_radius.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Border_radius
+title: Compass Border Radius
-crumb: Border_radius
+crumb: Border Radius
 framework: compass
 stylesheet: compass/css3/_border_radius.sass
 classnames:

doc-src/content/reference/compass/css3/box_shadow.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Box_shadow
+title: Compass Box Shadow
-crumb: Box_shadow
+crumb: Box Shadow
 framework: compass
 stylesheet: compass/css3/_box_shadow.sass
 classnames:

doc-src/content/reference/compass/css3/box_sizing.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Box_sizing
+title: Compass Box Sizing
-crumb: Box_sizing
+crumb: Box Sizing
 framework: compass
 stylesheet: compass/css3/_box_sizing.sass
 classnames:

doc-src/content/reference/compass/css3/font_face.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Font_face
+title: Compass Font Face
-crumb: Font_face
+crumb: Font Face
 framework: compass
 stylesheet: compass/css3/_font_face.sass
 classnames:

doc-src/content/reference/compass/css3/inline_block.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Inline_block
+title: Compass Inline Block
-crumb: Inline_block
+crumb: Inline Block
 framework: compass
 stylesheet: compass/css3/_inline_block.sass
 classnames:

doc-src/content/reference/compass/css3/text_shadow.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Text_shadow
+title: Compass Text Shadow
-crumb: Text_shadow
+crumb: Text Shadow
 framework: compass
 stylesheet: compass/css3/_text_shadow.sass
 classnames:

doc-src/content/reference/compass/layout/sticky_footer.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Sticky_footer
+title: Compass Sticky Footer
-crumb: Sticky_footer
+crumb: Sticky Footer
 framework: compass
 stylesheet: compass/layout/_sticky_footer.sass
 classnames:

doc-src/content/reference/compass/utilities/general/tag_cloud.haml

@@ -1,6 +1,6 @@
 --- 
 title: Compass Tag_cloud
-crumb: Tag_cloud
+crumb: Tag Cloud
 framework: compass
 stylesheet: compass/utilities/general/_tag_cloud.sass
 classnames:

doc-src/content/reference/compass/utilities/links/hover_link.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Hover_link
+title: Compass Hover Link
-crumb: Hover_link
+crumb: Hover Link
 framework: compass
 stylesheet: compass/utilities/links/_hover_link.sass
 classnames:

doc-src/content/reference/compass/utilities/links/link_colors.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Link_colors
+title: Compass Link Colors
-crumb: Link_colors
+crumb: Link Colors
 framework: compass
 stylesheet: compass/utilities/links/_link_colors.sass
 classnames:

doc-src/content/reference/compass/utilities/links/unstyled_link.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Unstyled_link
+title: Compass Unstyled Link
-crumb: Unstyled_link
+crumb: Unstyled Link
 framework: compass
 stylesheet: compass/utilities/links/_unstyled_link.sass
 classnames:

doc-src/content/reference/compass/utilities/lists/horizontal_list.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Horizontal_list
+title: Compass Horizontal List
-crumb: Horizontal_list
+crumb: Horizontal List
 framework: compass
 stylesheet: compass/utilities/lists/_horizontal_list.sass
 classnames:

doc-src/content/reference/compass/utilities/lists/inline_list.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Inline_list
+title: Compass Inline List
-crumb: Inline_list
+crumb: Inline List
 framework: compass
 stylesheet: compass/utilities/lists/_inline_list.sass
 classnames:

doc-src/content/reference/compass/utilities/sprites/sprite_img.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Sprite_img
+title: Compass Sprite Image
-crumb: Sprite_img
+crumb: Sprite Image
 framework: compass
 stylesheet: compass/utilities/sprites/_sprite_img.sass
 classnames:

doc-src/content/reference/compass/utilities/tables/alternating_rows_and_columns.haml

@@ -1,6 +1,6 @@
 --- 
-title: Compass Alternating_rows_and_columns
+title: Compass Alternating Rows and Columns
-crumb: Alternating_rows_and_columns
+crumb: Alternating Rows And Columns
 framework: compass
 stylesheet: compass/utilities/tables/_alternating_rows_and_columns.sass
 classnames:

doc-src/content/stylesheets/main.sass

@@ -12,11 +12,11 @@ body
   +container
 
 #main
-  +column(18, true)
+  +column(16, true)
-  +prepend(6)
+  +prepend(8)
 
 #sidebar
-  +column(6)
+  +column(8)
   +pull(24, true)
 
 body.reference

doc-src/layouts/default.haml

@@ -14,11 +14,7 @@
       #main
         = yield
       #sidebar
-        %h2
+        = render "partials/sidebar"
-          Compass Documentation
-        %ul
-          %li= link_to "Blueprint Reference", reference_path(:stylesheet => "_blueprint.sass")
-          %li= link_to "Compass Reference", reference_path(:stylesheet => "_compass.sass")
       #footer= @item[:content_for_footer]
     :javascript
       $(function(){

doc-src/layouts/partials/sidebar.haml

@@ -0,0 +1,5 @@
+%h2
+  Compass Documentation
+%ul
+  = item_tree(reference_item(:stylesheet => "_blueprint.sass"))
+  = item_tree(reference_item(:stylesheet => "_compass.sass"))

doc-src/lib/default.rb

@@ -46,3 +46,22 @@ end
 def cycle(*args)
   yield Recycler.new *args
 end
+
+def default_path(item)
+  item.reps.find{|r| r.name == :default}.path
+end
+
+def item_tree(item)
+  crumb = item[:crumb] || item[:title]
+  child_html = ""
+  if item.children.any?
+    child_html << "<ol>"
+    item.children.each do |child|
+      child_html << item_tree(child)
+    end
+    child_html << "</ol>"
+  end
+  %Q{<li><a href="#{default_path(item)}">#{crumb}</a>#{child_html}</li>}
+end
+
+

doc-src/lib/stylesheets.rb

@@ -28,18 +28,21 @@ def imports(item)
   imports
 end
 
-def reference_path(options)
+def reference_item(options)
   stylesheet = options[:stylesheet]
   path = stylesheet_path(stylesheet)
   if path
-    item = @items.detect do |i|
+    @items.detect do |i|
       i[:stylesheet] == path &&
       i.identifier =~ /^\/reference/
     end
-    if item
+  end
-      rep = item.reps.find { |r| r.name == :default }
+end
-      rep.path
+
-    end
+def reference_path(options)
+  if item = reference_item(options)
+    rep = item.reps.find { |r| r.name == :default }
+    rep.path
   end
 end
 

doc-src/lib/stylesheets/sass_extensions.rb

@@ -141,7 +141,7 @@ module Sass
         sass_str = "#{name.inspect}"
         if default_value
           sass_str << " = "
-          sass_str << default_value.inspect
+          sass_str << default_value.to_sass
         end
         sass_str
       end