Changed to bootstrap-sass

DominicHong · Jul 3, 2012 · 2758d0a · 2758d0a
1 parent b2b32de
commit 2758d0a
Show file tree

Hide file tree

Showing 35 changed files with 246 additions and 1,645 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ gem 'kaminari'
 gem 'validates_existence'
 gem 'jquery-rails'
 gem 'faker'
+gem 'bootstrap-sass', '~> 2.0.4.0'
 
 # Gems used only for assets and not required
 # in production environments by default.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,6 +30,7 @@ GEM
       multi_json (~> 1.0)
     annotate (2.4.0)
     arel (3.0.2)
+    bootstrap-sass (2.0.4.0)
     builder (3.0.0)
     coffee-rails (3.2.1)
       coffee-script (>= 2.2.0)
@@ -155,6 +156,7 @@ PLATFORMS
 
 DEPENDENCIES
   annotate
+  bootstrap-sass (~> 2.0.4.0)
   coffee-rails (= 3.2.1)
   factory_girl_rails
   faker

diff --git a/app/assets/stylesheets/blueprint/ie.css b/app/assets/stylesheets/blueprint/ie.css
diff --git a/app/assets/stylesheets/blueprint/plugins/buttons/icons/cross.png b/app/assets/stylesheets/blueprint/plugins/buttons/icons/cross.png
diff --git a/app/assets/stylesheets/blueprint/plugins/buttons/icons/key.png b/app/assets/stylesheets/blueprint/plugins/buttons/icons/key.png
diff --git a/app/assets/stylesheets/blueprint/plugins/buttons/icons/tick.png b/app/assets/stylesheets/blueprint/plugins/buttons/icons/tick.png
diff --git a/app/assets/stylesheets/blueprint/plugins/buttons/readme.txt b/app/assets/stylesheets/blueprint/plugins/buttons/readme.txt
diff --git a/app/assets/stylesheets/blueprint/plugins/buttons/screen.css b/app/assets/stylesheets/blueprint/plugins/buttons/screen.css
diff --git a/app/assets/stylesheets/blueprint/plugins/fancy-type/readme.txt b/app/assets/stylesheets/blueprint/plugins/fancy-type/readme.txt
diff --git a/app/assets/stylesheets/blueprint/plugins/fancy-type/screen.css b/app/assets/stylesheets/blueprint/plugins/fancy-type/screen.css
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/doc.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/doc.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/email.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/email.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/external.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/external.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/feed.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/feed.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/im.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/im.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/lock.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/lock.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/pdf.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/pdf.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/visited.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/visited.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/icons/xls.png b/app/assets/stylesheets/blueprint/plugins/link-icons/icons/xls.png
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/readme.txt b/app/assets/stylesheets/blueprint/plugins/link-icons/readme.txt
diff --git a/app/assets/stylesheets/blueprint/plugins/link-icons/screen.css b/app/assets/stylesheets/blueprint/plugins/link-icons/screen.css
diff --git a/app/assets/stylesheets/blueprint/plugins/rtl/readme.txt b/app/assets/stylesheets/blueprint/plugins/rtl/readme.txt