Re-enable bootstrap by downgrading to sprockets 2.11.0.

See sstephenson/sprockets#540.
bsingr · Mar 15, 2014 · 7e456c9 · 7e456c9
1 parent 5fcd461
commit 7e456c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -89,3 +89,7 @@ group :test, :development do
 end
 
 gem 'rails-zero', github: 'dpree/rails-zero'
+
+gem 'sprockets', '~> 2.11.0' # 2.12.0 doesnt work right now
+                             # https://github.com/sstephenson/sprockets/issues/540
+gem 'tilt', '~> 1.3.3'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
       railties (>= 3.0, < 4.1)
       slim (~> 2.0)
     slop (3.4.7)
-    sprockets (2.12.0)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -236,7 +236,7 @@ GEM
     thor (0.18.1)
     thread_safe (0.2.0)
       atomic (>= 1.1.7, < 2)
-    tilt (1.4.1)
+    tilt (1.3.7)
     timers (1.1.0)
     treetop (1.4.15)
       polyglot
@@ -283,8 +283,10 @@ DEPENDENCIES
   skim
   slim
   slim-rails
+  sprockets (~> 2.11.0)
   sqlite3
   squeel
   teaspoon
+  tilt (~> 1.3.3)
   turbolinks
   uglifier (>= 1.3.0)
diff --git a/app/assets/stylesheets/pods.css.scss b/app/assets/stylesheets/pods.css.scss
@@ -2,7 +2,7 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-//@import "bootstrap";
+@import "bootstrap";
 
 $headerTextCol: #ddd;
 $headBg: #eee;