Gemfile.locl

.gitignore

@@ -26,3 +26,5 @@ attic
 devbin
 .rvmrc
 *.rbc
+vendor/ruby
+vendor

Gemfile

@@ -7,7 +7,8 @@ gem "rspec", "~>2.0.0"
 gem "rails", "~>3.0.0.rc"
 gem "compass-validator", "3.0.0"
 gem "css_parser", "~> 1.0.1"
-#gem "sass", "~> 3.1.1"
+gem "sass", "3.1"
+gem "haml", "~> 3.1"
 gem "rcov"
 gem "rubyzip"
 gem "livereload"
@@ -15,14 +16,16 @@ gem "rb-fsevent" if RUBY_PLATFORM =~ /darwin/
 
 gem "ruby-prof" unless RUBY_PLATFORM == "java"
 
-
 gem 'autotest'
 gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/
 gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git'
 gem 'mocha'
 gem 'timecop'
+<<<<<<< HEAD
 gem 'diff-lcs', '~> 1.1.2'
 
 
 
 
+=======
+>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd

Gemfile.lock

@@ -119,7 +119,11 @@ GEM
     ruby-json (1.1.2)
     ruby-prof (0.10.5)
     rubyzip (0.9.4)
+<<<<<<< HEAD
     sass (3.1.1)
+=======
+    sass (3.1.0)
+>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
     sys-uname (0.8.5)
     term-ansicolor (1.0.5)
     thor (0.14.6)
@@ -140,6 +144,10 @@ DEPENDENCIES
   cucumber (~> 0.9.2)
   diff-lcs (~> 1.1.2)
   fakefs!
+<<<<<<< HEAD
+=======
+  haml (~> 3.1)
+>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
   livereload
   mocha
   rails (~> 3.0.0.rc)
@@ -148,4 +156,8 @@ DEPENDENCIES
   rspec (~> 2.0.0)
   ruby-prof
   rubyzip
+<<<<<<< HEAD
+=======
+  sass (= 3.1)
+>>>>>>> f3ea546150ded6fb0ee1ca91cde4c0349f088ddd
   timecop

doc-src/.gitignore

@@ -1,3 +1,4 @@
 bin
 vendor
 output
+vendor/ruby

doc-src/Gemfile

@@ -8,8 +8,8 @@ gem 'mime-types'
 gem 'serve', "1.0.0"
 gem 'nokogiri'
 gem 'coderay'
-gem 'sass', ">= 3.1.0.alpha.249"
-gem 'haml', ">= 3.1.0.alpha.36"
+gem 'sass', ">= 3.1"
+gem 'haml', ">= 3.1"
 gem 'rake'
 gem 'compass', :path => ".."
 gem 'compass-susy-plugin', ">=0.7.0.pre8"

doc-src/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: ..
   specs:
-    compass (0.11.1.63cae60)
+    compass (0.11.1.26f44fd)
       chunky_png (~> 1.1)
       fssm (>= 0.2.7)
       sass (~> 3.1)
@@ -54,7 +54,7 @@ DEPENDENCIES
   compass-susy-plugin (>= 0.7.0.pre8)
   css-slideshow (= 0.2.0)
   css_parser (= 1.0.1)
-  haml (>= 3.1.0.alpha.36)
+  haml (>= 3.1)
   json
   mime-types
   nanoc3!
@@ -64,6 +64,6 @@ DEPENDENCIES
   rb-fsevent
   rdiscount
   ruby-prof
-  sass (>= 3.1.0.alpha.249)
+  sass (>= 3.1)
   serve (= 1.0.0)
   thor

doc-src/content/reference.haml

@@ -0,0 +1,4 @@
+---
+title: Compass Documentation
+redirect: /reference/compass/
+---

doc-src/layouts/article.haml

@@ -12,7 +12,7 @@
           Version:
           %a.number(href="/CHANGELOG/")= compass_version
       %article= yield
-      -#comments= render "partials/disqus_comments"
+      -comments= render "partials/disqus_comments"
     %footer(role="contentinfo")= render "partials/footer"
   = @item[:content_for_javascripts]
   = render "partials/analytics"

doc-src/layouts/example.haml

@@ -14,7 +14,7 @@
           Version:
           %a.number(href="/CHANGELOG/")= compass_version
       %article= yield
-      -#comments= render "partials/disqus_comments"
+      -comments= render "partials/disqus_comments"
     %footer(role="contentinfo")= render "partials/footer"
   = @item[:content_for_javascripts]
   = render "partials/analytics"

doc-src/layouts/redirect.haml

@@ -0,0 +1,5 @@
+!!!5
+- # This template redirects.
+%html{:dir => "ltr", :lang => "en"}
+  %head
+    %meta{:"http-equiv" => "refresh", :content => "0;#{@item[:redirect]}"}/