# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1398212645 -32400
# Node ID 41b0903c9b2bc6ca360d27c45b14c548442e4c37
# Parent  682abad78313423fbfd932cb90baa518c7242440
Use official bootstrap gem.

diff -r 682abad78313 -r 41b0903c9b2b Gemfile
--- 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
 
diff -r 682abad78313 -r 41b0903c9b2b Gemfile.lock
--- 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
diff -r 682abad78313 -r 41b0903c9b2b app/assets/javascripts/application.js
--- 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
diff -r 682abad78313 -r 41b0903c9b2b app/assets/stylesheets/app_bootstrap.scss
--- a/app/assets/stylesheets/app_bootstrap.scss	Mon Apr 14 17:32:12 2014 +0900
+++ b/app/assets/stylesheets/app_bootstrap.scss	Wed Apr 23 09:24:05 2014 +0900
@@ -1,4 +1,4 @@
-@import 'twitter/bootstrap';
+@import 'bootstrap';
 @import 'sticky-footer';
 
 // Rails support.