From 07a9e6fc9f484b1534ce84f3235cf366ecdb6f74 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Wed, 22 Jan 2014 09:25:47 -0500 Subject: [PATCH] Fixed application.css.scss --- Gemfile | 2 +- Gemfile.lock | 2 +- app/assets/stylesheets/application.css.scss | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f84a6c8..ace6b97 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ end #MY GEMS gem 'devise' gem 'cancan' -gem 'bootstrap-sass', '2.3.2.0' +gem 'bootstrap-sass' # Use ActiveModel has_secure_password diff --git a/Gemfile.lock b/Gemfile.lock index 6739bde..94299bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,7 +122,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (= 2.3.2.0) + bootstrap-sass cancan coffee-rails (~> 4.0.0) devise diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 97fbd0e..72bb909 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -8,7 +8,8 @@ * 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 bootstrap *= require_self *= require_tree . */ - @import "bootstrap"; +