diff --git a/Gemfile b/Gemfile index 22fb51e1..7f1994df 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ 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", :path => "../sass" +gem "sass" gem "rcov" gem "rubyzip" gem "livereload" diff --git a/doc-src/Gemfile b/doc-src/Gemfile index bca77656..b9cebae0 100644 --- a/doc-src/Gemfile +++ b/doc-src/Gemfile @@ -9,7 +9,7 @@ gem 'fssm' gem 'serve', "1.0.0" gem 'nokogiri' gem 'coderay' -gem 'sass', :path => "../../sass" +gem 'sass', ">= 3.1.0.alpha.50" gem 'haml', ">= 3.1.0.alpha.36" gem 'rake' gem 'compass', :path => ".." diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 91597fe2..fe03be3f 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -8,14 +8,9 @@ GIT PATH remote: .. specs: - compass (0.11.alpha.1.610f3cd) + compass (0.11.alpha.3.04fb6df) chunky_png (~> 0.10.3) - sass (~> 3.1) - -PATH - remote: ../../sass - specs: - sass (3.1.0.alpha.0) + sass (>= 3.1.0.alpha.50) GEM remote: http://rubygems.org/ @@ -37,7 +32,7 @@ GEM rack (1.2.1) rake (0.8.7) rdiscount (1.6.5) - sass (3.1.0.alpha.28) + sass (3.1.0.alpha.50) serve (1.0.0) activesupport (~> 3.0.1) i18n (~> 0.4.1) @@ -63,6 +58,6 @@ DEPENDENCIES rack rake rdiscount - sass! + sass (>= 3.1.0.alpha.50) serve (= 1.0.0) thor