diff --git a/.gitignore b/.gitignore index ecc3e275..6a991e7e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ attic devbin .rvmrc *.rbc +vendor/ruby +vendor diff --git a/Gemfile b/Gemfile index 920ce595..8684c90a 100644 --- a/Gemfile +++ b/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 diff --git a/Gemfile.lock b/Gemfile.lock index 94766d49..29487042 100644 --- a/Gemfile.lock +++ b/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 diff --git a/doc-src/.gitignore b/doc-src/.gitignore index 2a378b3c..d9154566 100644 --- a/doc-src/.gitignore +++ b/doc-src/.gitignore @@ -1,3 +1,4 @@ bin vendor output +vendor/ruby diff --git a/doc-src/Gemfile b/doc-src/Gemfile index 02cd4b7f..5b880cc3 100644 --- a/doc-src/Gemfile +++ b/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" diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 669c3b15..14cfbefa 100644 --- a/doc-src/Gemfile.lock +++ b/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 diff --git a/doc-src/assets/images/sites/sencha.jpg b/doc-src/assets/images/sites/sencha.jpg index ae31aeda..4defec70 100644 Binary files a/doc-src/assets/images/sites/sencha.jpg and b/doc-src/assets/images/sites/sencha.jpg differ diff --git a/doc-src/content/reference.haml b/doc-src/content/reference.haml new file mode 100644 index 00000000..594a4334 --- /dev/null +++ b/doc-src/content/reference.haml @@ -0,0 +1,4 @@ +--- +title: Compass Documentation +redirect: /reference/compass/ +--- \ No newline at end of file diff --git a/doc-src/layouts/article.haml b/doc-src/layouts/article.haml index 89da0430..6e749f09 100644 --- a/doc-src/layouts/article.haml +++ b/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" diff --git a/doc-src/layouts/example.haml b/doc-src/layouts/example.haml index b6e3caf4..67937596 100644 --- a/doc-src/layouts/example.haml +++ b/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" diff --git a/doc-src/layouts/redirect.haml b/doc-src/layouts/redirect.haml new file mode 100644 index 00000000..5c7c76ff --- /dev/null +++ b/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]}"}/ \ No newline at end of file diff --git a/doc-src/lib/search.rb b/doc-src/lib/search.rb index f5f5d47b..9ed0de70 100644 --- a/doc-src/lib/search.rb +++ b/doc-src/lib/search.rb @@ -1,35 +1,35 @@ require 'json' STOP_WORDS = %w{ - a about above across after afterwards again against all almost - alone along already also although always am among amongst amoungst - amount an and another any anyhow anyone anything anyway anywhere - are around as at back be became because become becomes becoming - been before beforehand behind being below beside besides between - beyond bill both bottom but by call can cannot cant co computer con - could couldnt cry de describe detail do done down due during each - eg eight either eleven else elsewhere empty enough etc even ever - every everyone everything everywhere except few fifteen fify fill - find fire first five for former formerly forty found four from - front full further get give go had has hasnt have he hence her here - hereafter hereby herein hereupon hers herself him himself his how - however hundred i ie if in inc indeed interest into is it its - itself keep last latter latterly least less ltd made many may me - meanwhile might mill mine more moreover most mostly move much must - my myself name namely neither never nevertheless next nine no - nobody none noone nor not nothing now nowhere of off often on once - one only onto or other others otherwise our ours ourselves out over - own part per perhaps please put rather re same see seem seemed - seeming seems serious several she should show side since sincere - six sixty so some somehow someone something sometime sometimes - somewhere still such system take ten than that the their them - themselves then thence there thereafter thereby therefore therein - thereupon these they thick thin third this those though three - through throughout thru thus to together too top toward towards - twelve twenty two un under until up upon us very via was we well - were what whatever when whence whenever where whereafter whereas - whereby wherein whereupon wherever whether which while whither who - whoever whole whom whose why will with within without would yet you + a about above across after afterwards again against all almost + alone along already also although always am among amongst amoungst + amount an and another any anyhow anyone anything anyway anywhere + are around as at back be became because become becomes becoming + been before beforehand behind being below beside besides between + beyond bill both bottom but by call can cannot cant co computer con + could couldnt cry de describe detail do done down due during each + eg eight either eleven else elsewhere empty enough etc even ever + every everyone everything everywhere except few fifteen fify fill + find fire first five for former formerly forty found four from + front full further get give go had has hasnt have he hence her here + hereafter hereby herein hereupon hers herself him himself his how + however hundred i ie if in inc indeed interest into is it its + itself keep last latter latterly least less ltd made many may me + meanwhile might mill mine more moreover most mostly move much must + my myself name namely neither never nevertheless next nine no + nobody none noone nor not nothing now nowhere of off often on once + one only onto or other others otherwise our ours ourselves out over + own part per perhaps please put rather re same see seem seemed + seeming seems serious several she should show side since sincere + six sixty so some somehow someone something sometime sometimes + somewhere still such system take ten than that the their them + themselves then thence there thereafter thereby therefore therein + thereupon these they thick thin third this those though three + through throughout thru thus to together too top toward towards + twelve twenty two un under until up upon us very via was we well + were what whatever when whence whenever where whereafter whereas + whereby wherein whereupon wherever whether which while whither who + whoever whole whom whose why will with within without would yet you your yours yourself yourselves } unless defined?(STOP_WORDS)