merge

.gitignore

@@ -1,7 +1,9 @@
 # Include your project-specific ignores in this file
 # Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
 
-
+/.sass
+/source/documentation
+/data/version.yml
 
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 #

.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3-p194@tools-middleman-html5bp-haml --create

Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "builder"
+gem "rake"
 #gem "kss"
 
 gem "middleman", "~>3.1.5"
@@ -11,7 +12,7 @@ gem "middleman-syntax"
 gem "redcarpet"
 gem "susy", "2.0.0.alpha.4"
 gem "breakpoint"
-#gem "typogruby"
+gem "typogruby"
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
 platforms :mri_18 do
   gem "ruby18_source_location"

Gemfile.lock

@@ -83,6 +83,7 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.2)
       ffi (>= 0.5.0)
@@ -92,6 +93,7 @@ GEM
     rouge (0.3.10)
       thor
     ruby18_source_location (0.2)
+    rubypants (0.2.0)
     sass (3.2.12)
     sprockets (2.10.0)
       hike (~> 1.2)
@@ -109,6 +111,8 @@ GEM
       sass (>= 3.2.0)
     thor (0.18.1)
     tilt (1.3.7)
+    typogruby (1.0.16)
+      rubypants
     uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -123,7 +127,9 @@ DEPENDENCIES
   middleman-favicon-maker
   middleman-livereload
   middleman-syntax
+  rake
   redcarpet
   ruby18_source_location
   susy (= 2.0.0.alpha.4)
+  typogruby
   wdm (~> 0.1.0)

Rakefile

@@ -0,0 +1,52 @@
+def bundle(cmd)
+  old_bundle_gemfile = ENV["BUNDLE_GEMFILE"]
+  ENV.delete("BUNDLE_GEMFILE")
+  sh %{bundle #{cmd}}
+ensure
+  ENV["BUNDLE_GEMFILE"]
+end
+
+task :sass do
+  unless Dir.exists?(".sass")
+    sh %{git clone git://github.com/nex3/sass .sass}
+  end
+
+  Dir.chdir(".sass") do
+    sh %{rm -f Gemfile}
+    sh %{git fetch}
+    sh %{git checkout origin/stable}
+    # Check out the most recent released stable version
+    sh %{git checkout #{File.read("VERSION").strip}}
+
+    # Stable doesn't have a Gemfile, but it needs one to avoid using
+    # this package's Gemfile. This should be removed when 3.3 is
+    # released.
+    File.open('Gemfile', 'w') do |f|
+      f.puts <<GEMFILE
+source "https://rubygems.org"
+gemspec
+gem 'rake'
+GEMFILE
+    end
+
+    bundle 'install'
+  end
+end
+
+task :sass_version => :sass do
+  require 'yaml'
+  version = File.read(".sass/VERSION").strip
+  name = File.read(".sass/VERSION_NAME").strip
+  File.open('data/version.yml', 'w') {|f| f.write(YAML.dump({'number' => version, 'name' => name}))}
+end
+
+task :sass_docs => :sass do
+  Dir.chdir(".sass") {bundle %{exec rake doc}}
+  sh %{rm -rf source/documentation}
+  sh %{cp -r .sass/doc source/documentation}
+  sh %{find source/documentation -name '*.html' } +
+    %{-exec sed 's/css\\/common\\.css/..\\/assets\\/stylesheets\\/docs.css/g' -i {} \\;}
+end
+
+desc "Import information from Sass."
+task :import_sass => [:sass_version, :sass_docs]

config.rb

@@ -1,5 +1,7 @@
 require "builder"
 require 'susy'
+require 'breakpoint'
+require 'middleman-syntax'
 # TODO: Make this work
 # require "kss"
 # require 'typogruby'
@@ -58,6 +60,7 @@ with_layout :styleguide do
   #@styleguide = Kss::Parser.new('source/css')
 end
 
+page "/documentation/*", :directory_index => false
 
 
 

data/version.yml

@@ -1,3 +0,0 @@
-number: 3.2.12
-name: Media Mark
-notes: ~

source/assets/stylesheets/docs.css.scss

@@ -0,0 +1,7 @@
+/*! Sass
+ *  by Team Sass Design (@teamsassdesign)
+ */
+
+.maruku_toc {
+  display: none;
+}

source/documentation.haml

@@ -1,12 +0,0 @@
----
-title: Documentation
----
-
-%p= link_to "Yardocs will go here.", "http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html"
-
-
-
-- content_for (:complementary) do
-  %h3 Elsewhere
-  %ul
-    %li= link_to "Better Sass Docs", "http://www.kaelig.fr/bettersassdocs/"

source/layouts/layout.haml

@@ -25,7 +25,10 @@
       .alert.release
         .container
           %ul
+            - if data.respond_to?(:version)
               %li Current Release: <span class="release-name">#{data.version.name} (#{data.version.number})</span>
+            - else
+              %li Current Release: <span class="release-name">???</span>
             %li=link_to "Release Notes", "http://sass-lang.com/docs/yardoc/file.SASS_CHANGELOG.html"
             %li=link_to "Fork on Github", "https://github.com/nex3/sass"
 

source/layouts/regions/_banner.haml

@@ -6,7 +6,7 @@
       :markdown
         * [Install](/install)
         * [Learn Sass](/guide)
-        * [Documentation](/documentation)
+        * [Documentation](/documentation/file.SASS_REFERENCE.html)
         * [Get Involved](/community)
 
     .banner-toggle