Mercurial > zeropaste
changeset 334:41b0903c9b2b
Use official bootstrap gem.
| author | edogawaconan <me@myconan.net> |
|---|---|
| date | Wed, 23 Apr 2014 09:24:05 +0900 |
| parents | 682abad78313 |
| children | 58d7fa50b8cc |
| files | Gemfile Gemfile.lock app/assets/javascripts/application.js app/assets/stylesheets/app_bootstrap.scss |
| diffstat | 4 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Gemfile Mon Apr 14 17:32:12 2014 +0900 +++ b/Gemfile Wed Apr 23 09:24:05 2014 +0900 @@ -14,7 +14,7 @@ gem "sass-rails" gem "uglifier" -gem "anjlab-bootstrap-rails", :require => "bootstrap-rails" +gem "bootstrap-sass" gem "therubyrhino", :platforms => :jruby
--- a/Gemfile.lock Mon Apr 14 17:32:12 2014 +0900 +++ b/Gemfile.lock Wed Apr 23 09:24:05 2014 +0900 @@ -32,10 +32,9 @@ minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - anjlab-bootstrap-rails (3.0.3.0) - railties (>= 3.0) - sass (>= 3.2) arel (5.0.0) + bootstrap-sass (3.1.1.1) + sass (~> 3.2) bouncy-castle-java (1.5.0147) builder (3.2.2) dalli (2.7.0) @@ -130,7 +129,7 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter - anjlab-bootstrap-rails + bootstrap-sass dalli hooves jquery-rails
--- a/app/assets/javascripts/application.js Mon Apr 14 17:32:12 2014 +0900 +++ b/app/assets/javascripts/application.js Wed Apr 23 09:24:05 2014 +0900 @@ -11,7 +11,7 @@ // GO AFTER THE REQUIRES BELOW. // //= require jquery_ujs -//= require twitter/bootstrap/tab -//= require twitter/bootstrap/button -//= require twitter/bootstrap/dropdown +//= require bootstrap/tab +//= require bootstrap/button +//= require bootstrap/dropdown //= require boot