Skip to content

Commit

Permalink
switch from 'twitter-bootstrap-rails' to 'bootstrap-sass'
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielKehoe committed Nov 21, 2011
1 parent 8f5b494 commit 9124bff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.textile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ h1. CHANGELOG

h2. 1.0.27 unreleased

* swicth from 'twitter-bootstrap-rails' to 'bootstrap-sass'
* 'application.css' renamed as 'application.css.scss'
* update gem 'factory_girl_rails' from 1.3.0 to 1.4.0

Expand Down
9 changes: 5 additions & 4 deletions recipes/html5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
# https://github.com/zurb/foundation-rails
gem 'zurb-foundation'
when 'bootstrap'
# https://github.com/seyhunak/twitter-bootstrap-rails
gem 'twitter-bootstrap-rails'
# https://github.com/thomas-mcdonald/bootstrap-sass
# http:https://rubysource.com/twitter-bootstrap-less-and-sass-understanding-your-options-for-rails-3-1/
gem 'bootstrap-sass'
end
after_bundler do
say_wizard "HTML5 recipe running 'after bundler'"
Expand All @@ -24,8 +25,8 @@
insert_into_file "app/assets/stylesheets/application.css.scss", " *= require foundation\n", :after => "require_self\n"
when 'bootstrap'
say_wizard "installing Twitter Bootstrap HTML5 framework"
insert_into_file "app/assets/javascripts/application.js", "//= require twitter/bootstrap\n", :after => "jquery_ujs\n"
insert_into_file "app/assets/stylesheets/application.css.scss", " *= require twitter/bootstrap\n", :after => "require_self\n"
insert_into_file "app/assets/javascripts/application.js", "//= require bootstrap\n", :after => "jquery_ujs\n"
insert_into_file "app/assets/stylesheets/application.css.scss", " *= require bootstrap\n", :after => "require_self\n"
when 'skeleton'
say_wizard "installing Skeleton HTML5 framework"
get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
Expand Down

0 comments on commit 9124bff

Please sign in to comment.