From 0ad7b6400ab4945b0474632f2f00c957085177d3 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 21 Aug 2013 22:56:46 +0200 Subject: [PATCH] Fixed usage of Bootstrap 3.0 --- Gemfile | 5 +++-- Gemfile.lock | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index d6f8ff8..cfd940f 100644 --- a/Gemfile +++ b/Gemfile @@ -57,8 +57,9 @@ end # Twitter Bootstrap template #gem 'bootstrap-sass' -gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' - +#gem 'anjlab-bootstrap-rails', '>= 3.0.0.0' +gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails', + :github => 'anjlab/bootstrap-rails' # Pagination # Hint: rails generate kaminari:views bootstrap gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 3a5914c..f9b189f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: git://github.com/anjlab/bootstrap-rails.git + revision: 056c63f1128a255688da1d064c5a2854ab5c8a9a + specs: + anjlab-bootstrap-rails (3.0.0.1) + railties (>= 3.0) + sass (>= 3.2) + GEM remote: https://rubygems.org/ specs: @@ -25,9 +33,6 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - anjlab-bootstrap-rails (3.0.0.1) - railties (>= 3.0) - sass (>= 3.2) arel (4.0.0) atomic (1.1.13) better_errors (0.9.0) @@ -136,7 +141,7 @@ PLATFORMS ruby DEPENDENCIES - anjlab-bootstrap-rails (>= 3.0.0.0) + anjlab-bootstrap-rails! better_errors binding_of_caller coffee-rails (~> 4.0.0)