Permalink
Browse files

Use simple form and twitter bootstrap

  • Loading branch information...
1 parent ff58d35 commit 5ef5ce7f586b9d4198fe1ef1115492fd8223ee89 @pkordel pkordel committed Mar 13, 2012
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.1'
+gem 'rails', '3.2.2'
gem 'thin'
@@ -14,6 +14,7 @@ group :assets do
# gem 'therubyracer'
gem 'uglifier', '>= 1.0.3'
+ gem 'bootstrap-sass'
end
gem 'jquery-rails'
@@ -33,6 +34,7 @@ gem 'friendly_id', '~> 4.0.0'
# View related
gem 'slim-rails'
gem 'kaminari'
+gem 'simple_form'
gem 'heroku', :group => :development
View
@@ -18,36 +18,37 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.1)
- actionpack (= 3.2.1)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
mail (~> 2.4.0)
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (3.0.0)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
+ bootstrap-sass (2.0.1)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -111,7 +112,7 @@ GEM
libxml-ruby (>= 1.1.4)
rake
rdoc
- journey (1.0.1)
+ journey (1.0.3)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
@@ -124,7 +125,7 @@ GEM
launchy (2.0.5)
addressable (~> 2.2.6)
libxml-ruby (2.2.2)
- mail (2.4.1)
+ mail (2.4.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -142,23 +143,23 @@ GEM
sfl (~> 2.0)
polyglot (0.3.3)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.1)
- actionmailer (= 3.2.1)
- actionpack (= 3.2.1)
- activerecord (= 3.2.1)
- activeresource (= 3.2.1)
- activesupport (= 3.2.1)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.2.1)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
+ railties (= 3.2.2)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -195,6 +196,9 @@ GEM
multi_json (~> 1.0.4)
rubyzip
sfl (2.1)
+ simple_form (2.0.1)
+ actionpack (~> 3.0)
+ activemodel (~> 3.0)
simplecov (0.5.4)
multi_json (~> 1.0.3)
simplecov-html (~> 0.5.3)
@@ -223,7 +227,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.32)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -235,6 +239,7 @@ PLATFORMS
DEPENDENCIES
bcrypt-ruby (~> 3.0.0)
+ bootstrap-sass
capybara
coffee-rails (~> 3.2.1)
cucumber-rails
@@ -251,11 +256,12 @@ DEPENDENCIES
nokogiri
pg
poltergeist
- rails (= 3.2.1)
+ rails (= 3.2.2)
rdf
rest-client
rspec-rails
sass-rails (~> 3.2.3)
+ simple_form
simplecov
slim-rails
sparql-client!
@@ -12,4 +12,16 @@
//
//= require jquery
//= require jquery_ujs
+//= require bootstrap-transition
+//= require bootstrap-alert
+//= require bootstrap-button
+//= require bootstrap-carousel
+//= require bootstrap-collapse
+//= require bootstrap-dropdown
+//= require bootstrap-modal
+//= require bootstrap-scrollspy
+//= require bootstrap-tab
+//= require bootstrap-tooltip
+//= require bootstrap-popover
+//= require bootstrap-typeahead
//= require_tree .
@@ -8,9 +8,6 @@
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
- *= require base
- *= require layout
- *= require skeleton
- *= require main
+ *= require_self
*= require_tree .
*/
Oops, something went wrong.

0 comments on commit 5ef5ce7

Please sign in to comment.