diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.sass | 2 |
3 files changed, 9 insertions, 8 deletions
@@ -25,7 +25,7 @@ gem 'coffee-rails', '~> 4.0.0.rc1' gem 'jquery-rails' gem 'uglifier', '>= 1.0.3' -gem 'bootstrap-sass' +gem 'bootstrap-sass-rails' group :test do gem 'rspec' diff --git a/Gemfile.lock b/Gemfile.lock index 03e640f..22faaa8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,8 +30,9 @@ GEM activerecord (>= 3.0.0) arel (4.0.0) atomic (1.1.8) - bootstrap-sass (2.3.1.1) - sass (~> 3.2) + bootstrap-sass-rails (2.3.1.1) + railties (>= 3.1.0) + sass-rails (>= 3.1.0) builder (3.1.4) coffee-rails (4.0.0) coffee-script (>= 2.2.0) @@ -70,7 +71,7 @@ GEM hashie (2.0.4) hike (1.2.2) i18n (0.6.4) - jbuilder (1.3.0) + jbuilder (1.4.0) activesupport (>= 3.0.0) multi_json (>= 1.2.0) jquery-rails (2.2.1) @@ -82,7 +83,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.23) - minitest (4.7.3) + minitest (4.7.4) msgpack (0.5.4) multi_json (1.7.2) multipart-post (1.2.0) @@ -156,7 +157,7 @@ GEM thor (0.18.1) thread_safe (0.1.0) atomic - tilt (1.3.7) + tilt (1.4.0) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -181,7 +182,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass + bootstrap-sass-rails coffee-rails (~> 4.0.0.rc1) counter_culture daemon-spawn diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 47e2903..8e493d0 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,4 +1,4 @@ -@import "bootstrap" +@import "twitter/bootstrap" @import "tweets" @import "users" @import "sidebar" |