diff --git a/Gemfile b/Gemfile index 758f11d..ab61680 100644 --- a/Gemfile +++ b/Gemfile @@ -54,3 +54,6 @@ group :development do # Chrome Rails debugging app gem 'meta_request' end + +# Twitter Bootstrap template +gem 'bootstrap-sass' diff --git a/Gemfile.lock b/Gemfile.lock index 8bc6a94..2590554 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,8 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) + bootstrap-sass (2.3.2.1) + sass (~> 3.2) builder (3.1.4) callsite (0.0.11) coderay (1.0.9) @@ -126,6 +128,7 @@ PLATFORMS DEPENDENCIES better_errors binding_of_caller + bootstrap-sass coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3192ec8..c92dff8 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,3 +11,5 @@ *= require_self *= require_tree . */ + +//= require bootstrap \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss new file mode 100644 index 0000000..c4b7e51 --- /dev/null +++ b/app/assets/stylesheets/application.css.scss @@ -0,0 +1,2 @@ +@import 'bootstrap'; +@import 'bootstrap-responsive';