add twitter bootstrap configuration

jsullivan · Apr 14, 2012 · 6053e36 · 6053e36
1 parent 164edb5
commit 6053e36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 56 deletions.
diff --git a/README.markdown b/README.markdown
@@ -0,0 +1,6 @@
+# HipHype readme
+
+## Installation and configuration
+1. install bundler
+2. run bundle install
+
diff --git a/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css → app/assets/stylesheets/application.css.scss
@@ -11,3 +11,5 @@
  *= require_self
  *= require_tree .
 */
+@import "bootstrap";
+
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
diff --git a/config/application.rb b/config/application.rb
@@ -1,6 +1,8 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
+require 'bootstrap-sass'
+
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line