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 b102fdf4..ae7d4a57 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +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.0.alpha.263" -gem "haml", "~> 3.1.0.alpha" +gem "sass", "3.1" +gem "haml", "~> 3.1" gem "rcov" gem "rubyzip" gem "livereload" @@ -16,12 +16,8 @@ gem "rb-fsevent" gem "ruby-prof" unless RUBY_PLATFORM == "java" - gem 'autotest' gem 'autotest-fsevent' gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'mocha' gem 'timecop' - - - diff --git a/Gemfile.lock b/Gemfile.lock index ec2d4004..20e317ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,10 +7,10 @@ GIT PATH remote: . specs: - compass (0.11.1) - chunky_png (~> 1.1.1) + compass (0.11.1.26f44fd) + chunky_png (~> 1.1) fssm (>= 0.2.7) - sass (>= 3.1.0.alpha.249) + sass (~> 3.1) GEM remote: http://rubygems.org/ @@ -120,7 +120,7 @@ GEM ruby-json (1.1.2) ruby-prof (0.10.5) rubyzip (0.9.4) - sass (3.1.0.alpha.263) + sass (3.1.0) sys-uname (0.8.5) term-ansicolor (1.0.5) thor (0.14.6) @@ -140,7 +140,7 @@ DEPENDENCIES css_parser (~> 1.0.1) cucumber (~> 0.9.2) fakefs! - haml (~> 3.1.0.alpha) + haml (~> 3.1) livereload mocha rails (~> 3.0.0.rc) @@ -149,5 +149,5 @@ DEPENDENCIES rspec (~> 2.0.0) ruby-prof rubyzip - sass (= 3.1.0.alpha.263) + sass (= 3.1) 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