Merge remote branch 'chris/docs' into docs

doc-src/.compass/config.rb

@@ -2,14 +2,14 @@
 # require 'susy'
 
 # Set this to the root of your project when deployed:
-http_path = "/"
+http_path = "/docs"
 project_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 css_dir = "../docs/stylesheets"
 sass_dir = "content/stylesheets"
 images_dir = "assets/images"
-http_images_dir = "images"
 javascripts_dir = "content/javascripts"
 http_javascripts_dir = "javascripts"
 http_stylesheets_dir = "stylesheets"
+http_images_dir = "images"
 # To enable relative paths to assets via compass helper functions. Uncomment:
 # relative_assets = true

doc-src/README.markdown

@@ -49,13 +49,13 @@ To compile (and auto recompile) and preview the site in your browser:
     $ export RUBYLIB="../lib:../../haml/lib"
     $ bin/nanoc3 aco
 
-Then open `http://localhost:3000/` in your web browser.
+Then open `http://localhost:3000/docs/` in your web browser.
 
 If you find `bin/nanoc3 aco` to be sluggish, try this alternative workflow:
 
     $ cd doc-src
     $ export RUBYLIB="../lib:../../haml/lib"
-    $ serve 3000 .. &
+    $ ./bin/serve 3000 .. &
     $ rake watch
 
 ## Documentation on Nanoc

doc-src/Rules

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'compass'
- 
-Compass.configuration.parse "#{File.dirname(__FILE__)}/.compass/config.rb"
+
+puts "Compass running from: #{Compass.lib_directory}"
+
+Compass.add_configuration "#{File.dirname(__FILE__)}/.compass/config.rb"
 
 SITE_ROOT = "/docs"
 

doc-src/content/index.haml

@@ -1,10 +1,28 @@
 ---
-title: Home
+title: Compass Documentation
+crumb: Docs
+body_id: home
 ---
-%h1 Compass Documentation
+%h1 Compass
 
 %p
-  Welcome to the compass docs.
+  Compass is a stylesheet authoring tool that uses the Sass stylesheet
+  language to make your stylesheets smaller and your web site easier to
+  maintain. Compass provides ports of the best of breed css frameworks
+  that you can use without forcing you to use their presentational class
+  names. It’s a new way of thinking about stylesheets that must be seen
+  in action!
 
-%ul
-  %li= link_to "Blueprint Reference", reference_path(:stylesheet => "blueprint.sass")
+%h2 Screencast Tutorial
+
+%p
+  This screencast will walk you through getting set up,
+  learning Sass, and then how to use Compass to style a webpage.
+
+<object width="660" height="371"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=4335944&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=4335944&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=0&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="660" height="371"></embed></object>
+
+%h2 Bugs Reports, Discussions, Support
+
+:markdown
+  Send a note to the [mailing list](http://groups.google.com/group/compass-users)
+  and/or [File a bug](http://github.com/chriseppstein/compass/issues).

doc-src/content/stylesheets/main.sass

@@ -81,4 +81,7 @@ ol#breadcrumbs
   li.last:after
     content: ""
   li.last
-    visibility: hidden
+    visibility: hidden
+body#home h1
+  +replace-text("compass.png", 0px)
+  height: 159px

doc-src/lib/default.rb

@@ -11,10 +11,10 @@ def body_class(item)
 end
 
 def body_id(item)
-  if id = item.identifier.chop[1..-1]
+  if item[:body_id]
+    item[:body_id]
+  elsif id = item.identifier.chop[1..-1]
     id.gsub(/\/|_/, "-")
-  else
-    nil
   end
 end