Skip to content

Commit

Permalink
Add bootstrap
Browse files Browse the repository at this point in the history
using gem less-rails-bootstrap
  • Loading branch information
dleehr committed Mar 7, 2013
1 parent f743337 commit d337c39
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 242 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -2,6 +2,8 @@ source 'https://rubygems.org'

gem 'rails', '3.2.12'
gem "paperclip", "~> 3.4.1"
gem 'less-rails-bootstrap'
gem 'therubyracer'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
Expand Down
15 changes: 15 additions & 0 deletions Gemfile.lock
Expand Up @@ -41,6 +41,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.1)
commonjs (0.2.6)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
Expand All @@ -51,6 +52,14 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
less (2.2.2)
commonjs (~> 0.2.6)
less-rails (2.2.6)
actionpack (>= 3.1)
less (~> 2.2.0)
less-rails-bootstrap (2.2.0)
less-rails (~> 2.2.0)
libv8 (3.11.8.13)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand Down Expand Up @@ -90,6 +99,7 @@ GEM
rake (10.0.3)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.2)
sass (3.2.6)
sass-rails (3.2.6)
railties (~> 3.2.0)
Expand All @@ -100,6 +110,9 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.17.0)
tilt (1.3.4)
treetop (1.4.12)
Expand All @@ -116,8 +129,10 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
less-rails-bootstrap
mysql2
paperclip (~> 3.4.1)
rails (= 3.2.12)
sass-rails (~> 3.2.3)
therubyracer
uglifier (>= 1.0.3)
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Expand Up @@ -13,3 +13,4 @@
//= require jquery
//= require jquery_ujs
//= require_tree .
//= require twitter/bootstrap
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.css
Expand Up @@ -10,4 +10,5 @@
*
*= require_self
*= require_tree .
*= require twitter/bootstrap
*/
2 changes: 1 addition & 1 deletion config/routes.rb
Expand Up @@ -5,6 +5,7 @@
resources :import_jobs
end

root :to => "csv_datasets#index"

# The priority is based upon order of creation:
# first created -> highest priority.
Expand Down Expand Up @@ -62,5 +63,4 @@
# This is a legacy wild controller route that's not recommended for RESTful applications.
# Note: This route will make all actions in every controller accessible via GET requests.
# match ':controller(/:action(/:id))(.:format)'
# lets make it restful instead
end
241 changes: 0 additions & 241 deletions public/index.html

This file was deleted.

0 comments on commit d337c39

Please sign in to comment.