more cleanings in assets

tomjoad · Apr 2, 2013 · 61a5231 · 61a5231
1 parent 48e76a2
commit 61a5231
Show file tree

Hide file tree

Showing 7 changed files with 11,877 additions and 1,162 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,6 @@ gem 'rails'
 gem 'rake'
 gem 'bootstrap-sass', '2.0.0'
 gem 'less-rails-bootstrap'
-gem 'jquery-rails'
 gem 'therubyracer'
 gem 'bcrypt-ruby', '3.0.1'
 gem 'twitter-bootstrap-rails', '2.2.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -76,9 +76,6 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.2.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
     json (1.7.6)
     less (2.2.2)
       commonjs (~> 0.2.6)
@@ -209,7 +206,6 @@ DEPENDENCIES
   guard-rspec (= 0.5.5)
   guard-spork (= 0.3.2)
   i18n
-  jquery-rails
   less-rails-bootstrap
   libnotify (= 0.5.9)
   paperclip (~> 3.0)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -11,8 +11,9 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require ./vendor/yui/yui-base
-//= require_tree ./vendor/bootstrap
-//= require jquery
-//= require jquery_ujs
+//= require ./vendor/bootstrap/bootstrap-datepicker
+//= require ./vendor/bootstrap/bootstrap-timepicker
+//= require ./vendor/jquery
+//= require twitter/bootstrap
 //= require_self
 //= require margherita