diff options
| author | elijah <elijah@riseup.net> | 2014-01-22 02:22:54 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-01-23 11:37:49 -0800 |
| commit | 8f624a9f6a130293d921e0f0076a3ecb08b481b7 (patch) | |
| tree | 0ad189a3ab300e84c490034cb6ab6d9eab967a65 | |
| parent | 67650ea9fead442cb2f66a2fbbec452c890d0775 (diff) | |
upgraded bootstrap to latest in 2.x series
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | core/lib/leap_web_core/dependencies.rb | 1 | ||||
| -rw-r--r-- | core/lib/leap_web_core/ui_dependencies.rb | 1 | ||||
| -rw-r--r-- | ui_dependencies.rb | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e60c9d0..e8a9831 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,8 @@ GEM multi_json (~> 1.0) addressable (2.3.5) arel (3.0.3) - bootstrap-sass (2.1.1.0) + bootstrap-sass (2.3.2.2) + sass (~> 3.2) bootswatch-rails (0.5.0) railties (>= 3.1) braintree (2.27.1) @@ -263,7 +264,7 @@ PLATFORMS DEPENDENCIES SyslogLogger (~> 2.0) - bootstrap-sass (~> 2.1.0) + bootstrap-sass (= 2.3.2.2) bootswatch-rails (~> 0.5.0) capybara certificate_authority! diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb index e4a8807..877e3d1 100644 --- a/core/lib/leap_web_core/dependencies.rb +++ b/core/lib/leap_web_core/dependencies.rb @@ -9,7 +9,6 @@ module LeapWebCore UI = { "haml" => "~> 3.1.7", - "bootstrap-sass" => "~> 2.0.4", "jquery-rails" => nil, "simple_form" => nil, "bootswatch-rails", "~> 0.5.0" diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb index c2fc8cf..2daee37 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/core/lib/leap_web_core/ui_dependencies.rb @@ -1,5 +1,4 @@ require "haml" -require "bootstrap-sass" require "jquery-rails" require "simple_form" require "bootswatch-rails" diff --git a/ui_dependencies.rb b/ui_dependencies.rb index e7f591e..4b5d706 100644 --- a/ui_dependencies.rb +++ b/ui_dependencies.rb @@ -1,5 +1,5 @@ gem "haml", "~> 3.1.7" -gem "bootstrap-sass", "~> 2.1.0" +gem "bootstrap-sass", "= 2.3.2.2" gem "jquery-rails" gem "simple_form" gem 'client_side_validations' |