quick commit, untested

Gemfile

@@ -11,7 +11,7 @@ group :assets do
   gem 'coffee-script'
   gem 'therubyracer', :platforms => :ruby
   gem 'less-rails'
-  gem 'twitter-bootstrap-rails'
+  gem 'bootstrap-sass'
 end
 
 gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'

Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
-  revision: 955a484c4046b3343f07fd0d783342d01bf26f66
+  revision: 04f58b15bb308420f78c66d27ce4d4d3b58183ff
   specs:
     simply_stored (1.0.0)
       activesupport
@@ -62,6 +62,7 @@ GEM
     activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.3.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     bourbon (2.1.2)
@@ -118,9 +119,9 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
     json (1.6.7)
     less (2.2.2)
       commonjs (~> 0.2.6)
@@ -128,7 +129,8 @@ GEM
       actionpack (>= 3.1)
       less (~> 2.2.0)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.6.1)
+    libwebsocket (0.1.7.1)
+      addressable
       websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -136,7 +138,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.4.0)
     nokogiri (1.5.5)
     orm_adapter (0.0.7)
     paperclip (3.3.1)
@@ -177,7 +179,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-core (2.12.0)
+    rspec-core (2.12.1)
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
@@ -208,7 +210,7 @@ GEM
       railties (~> 3.0)
       slim (~> 1.0)
     slop (3.3.3)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -225,19 +227,19 @@ GEM
       rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
-    tinymce-rails (3.5.7.1)
+    tinymce-rails (3.5.8)
       railties (>= 3.1.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter-bootstrap-rails (2.1.6)
+    twitter-bootstrap-rails (2.1.7)
       actionpack (>= 3.1)
       execjs
       railties (>= 3.1)
     tzinfo (0.3.35)
     warden (1.1.1)
       rack (>= 1.0)
-    websocket (1.0.3)
+    websocket (1.0.4)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 

app/assets/javascripts/cmtool/application.js

@@ -13,6 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require twitter/bootstrap
+//= require bootstrap
 //= require tinymce-jquery
 //= require_directory .

app/assets/stylesheets/cmtool/bootstrap_and_overrides.css.less

@@ -1,32 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-body { padding-top: 60px; }
-@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
-//       have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
-
-// Font Awesome
-@import "fontawesome";
-
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;

app/assets/stylesheets/cmtool/bootstrap_and_overrides.css.sass

@@ -0,0 +1,6 @@
+@import "bootstrap"
+
+body
+  padding-top: 60px
+
+@import "bootstrap-responsive"