Merge pull request greendog99#2 from Vaysman/master

Current version of rake 0.9 is incompatible with the current version of Rails 3.0.7. Fixed errors in partial.
bsleys · Jun 5, 2011 · c82a8e9 · c82a8e9
2 parents 1d04ab7 + 008350c
commit c82a8e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/files/Gemfile b/files/Gemfile
@@ -2,6 +2,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 3.0.5' # At least 3.0.5 but below 3.1
+gem 'rake', '~> 0.8.7'  # Rake 0.9 is incompatible with current version of Rails
 gem 'mysql2'            # Database engine
 gem 'hirb'              # Better console formatting. Needs .hirbrc
 

diff --git a/files/app/stylesheets/partials/_grid.sass b/files/app/stylesheets/partials/_grid.sass
@@ -4,8 +4,8 @@
 $columns:   12
 $col_width: 60px
 $gutter:    20px
-$margin   = $gutter / 2
-$width    = $columns * ($col_width + $gutter)
+$margin:    $gutter / 2
+$width:     $columns * ($col_width + $gutter)
 
 // Make the block n columns wide, with an optional extra value to
 // alter the standard width to account for padding, borders, etc.