Bootstrap 3 support

Gemfile

@@ -8,8 +8,10 @@ gem 'thin'
 
 gem 'uglifier'
 gem 'jquery-rails'
+gem 'sass-rails', '~> 4.0.2'
+gem 'bootstrap-sass', '~> 3.1.1.0'
 
-gem 'simple_form', '~> 3.0.0'
+gem 'simple_form', '~> 3.0.0', github: 'plataformatec/simple_form', branch: 'master'
 
 group :production do
   gem 'pg'

Gemfile.lock

@@ -1,32 +1,43 @@
+GIT
+  remote: git://github.com/plataformatec/simple_form.git
+  revision: af27764b814067687128820dd5b14cc129696a86
+  branch: master
+  specs:
+    simple_form (3.0.1)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.4)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     arel (4.0.2)
-    atomic (1.1.15)
+    atomic (1.1.16)
+    bootstrap-sass (3.1.1.0)
+      sass (~> 3.2)
     builder (3.1.4)
     daemons (1.1.9)
     erubis (2.7.0)
@@ -43,29 +54,32 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     pg (0.17.1)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.0.4)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
-    simple_form (3.0.1)
-      actionpack (>= 4.0.0, < 4.1)
-      activemodel (>= 4.0.0, < 4.1)
+    rake (10.2.2)
+    sass (3.2.18)
+    sass-rails (4.0.2)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -80,27 +94,29 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
-    thread_safe (0.2.0)
+    thor (0.19.1)
+    thread_safe (0.3.1)
       atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.39)
-    uglifier (2.4.0)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass (~> 3.1.1.0)
   jquery-rails
   json
   pg
   rails (~> 4.0.3)
-  simple_form (~> 3.0.0)
+  sass-rails (~> 4.0.2)
+  simple_form (~> 3.0.0)!
   sqlite3
   thin
   uglifier

README.md

@@ -1,13 +1,7 @@
-# SimpleForm and Twitter Bootstrap
+# Simple Form and Bootstrap
 
-This is a example application using [SimpleForm](https://github.com/plataformatec/simple_form)
-and [Twitter Bootstrap](http://twitter.github.io/bootstrap/).
-
-A copy of the `bootstrap.css` can be downloaded from the [official home page](http://twitter.github.io/bootstrap/), or using the following command to download from the demo site:
-
-```
-curl -L http://twitter.github.io/bootstrap/assets/css/bootstrap.css > vendor/assets/stylesheets/bootstrap.css
-```
+This is a example application using [Simple Form](https://github.com/plataformatec/simple_form)
+and [Bootstrap](http://getbootstrap.com/).
 
 ## License
 

app/assets/javascripts/application.js

@@ -7,20 +7,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap
-//= require google-code-prettify
 //
-
-$(function() {
-  prettyPrint();
-
-  $('a[data-code]').click(function(e) {
-    e.preventDefault();
-    $('pre').slideToggle();
-  });
-
-    $('#toggle-form').on('click', function(e) {
-      e.preventDefault();
-      $('.simple_form').toggleClass('form-vertical').toggleClass('form-horizontal');
-    })
-});
-

app/assets/stylesheets/application.css

@@ -1,61 +1,11 @@
 /*
  *= require bootstrap
- *= require google-code-prettify
 */
 
 body {
   padding-top: 60px;
 }
 
-.alert p.error_notification {
-  margin-bottom: 0;
-}
-
-div.well {
-  padding: 5px 10px;
-}
-
-pre { display: none; }
-
-article .content {
-  margin: 10px 0;
-}
-
-#article-comments {
-  padding: 10px;
-  border: 1px solid #ccc;
-  background: #f5f5f5;
-  border-radius: 3px;
-  margin-bottom: 10px;
-}
-
-#comments {
-  margin-bottom: 10px;
-}
-
-#article-comments form {
-  border-top: 1px solid #ccc;
-  padding-top: 10px;
-  margin-bottom: 0;
-}
-
-#article-comments .form-actions {
-  margin-bottom: 0;
-  padding-bottom: 0;
-}
-.form-actions {
-  height: 30px;
-}
-
-.navbar .brand {
-  float: right;
-  padding-right: 0;
-}
-
-.form-vertical .boolean .controls {
-  display: inline-block;
-}
-
 .footer {
   padding: 70px 0;
   margin-top: 70px;
@@ -70,6 +20,7 @@ article .content {
 
 .footer-links {
   margin: 10px 0;
+  padding: 0;
 }
 
 .footer-links li {