Skip to content

Commit

Permalink
#16 bootstrap-sass gem updated for bootstrap 3
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdilek committed Sep 5, 2013
1 parent 1a31842 commit d24d060
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'jquery-rails', '~> 3.0.4'
gem 'turbolinks', '~> 1.3.0'
gem 'haml', '~> 4.0.2'
gem 'haml-rails'
gem 'bootstrap-sass', '~> 2.3.1.0'
gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.git', :branch => '3'
gem 'responders', '~> 1.0.0.rc'
gem 'exception_notification', '~> 4.0.0'
gem 'simple_form', '~> 3.0.0.rc'
Expand Down
12 changes: 9 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ GIT
compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14)

GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 1344c58711e9ba30cbbd028908ea3fe6df73969d
branch: 3
specs:
bootstrap-sass (3.0.0.0)
sass (~> 3.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -42,8 +50,6 @@ GEM
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (2.3.1.3)
sass (~> 3.2)
builder (3.1.4)
capybara (2.1.0)
mime-types (>= 1.16)
Expand Down Expand Up @@ -209,7 +215,7 @@ PLATFORMS
DEPENDENCIES
better_errors
binding_of_caller
bootstrap-sass (~> 2.3.1.0)
bootstrap-sass!
capybara (~> 2.1.0)
coffee-rails (~> 4.0.0)
compass-rails!
Expand Down

0 comments on commit d24d060

Please sign in to comment.