Updated to use Haml 3.1.1, Sass 3.1.1 and Compass 0.11.1. Dropped sup…

…port for @media queries and updated the homepage content

Gemfile

@@ -1,6 +1,10 @@
 source 'http://rubygems.org'
 
-gem "serve", "~> 1.0.0"
-gem "grid-coordinates", "~> 1.1.4"
-gem "meyer-reset", "~> 2.0.0"
-gem "maruku", "~> 0.6.0"
+gem 'serve', '~> 1.0.0'
+gem 'haml', '~> 3.1.1'
+gem 'sass', '~> 3.1.1'
+gem 'compass', '~> 0.11.1'
+gem 'css_parser', '~> 1.1.9'
+gem 'grid-coordinates', '~> 1.1.4'
+gem 'meyer-reset', '~> 2.0.0'
+gem 'maruku', '~> 0.6.0'

Gemfile.lock

@@ -1,31 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.1)
-    compass (0.10.6)
-      haml (>= 3.0.4)
+    activesupport (3.0.7)
+    chunky_png (1.1.2)
+    compass (0.11.1)
+      chunky_png (~> 1.1)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    css_parser (1.1.9)
+    fssm (0.2.7)
     grid-coordinates (1.1.4)
       compass (>= 0.10.5)
-    haml (3.0.25)
+    haml (3.1.1)
     i18n (0.4.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
     meyer-reset (2.0.0)
       compass (>= 0.10.5)
-    rack (1.2.1)
+    rack (1.2.2)
+    sass (3.1.1)
     serve (1.0.0)
       activesupport (~> 3.0.1)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
       tzinfo (~> 0.3.23)
     syntax (1.0.0)
-    tzinfo (0.3.23)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  compass (~> 0.11.1)
+  css_parser (~> 1.1.9)
   grid-coordinates (~> 1.1.4)
+  haml (~> 3.1.1)
   maruku (~> 0.6.0)
   meyer-reset (~> 2.0.0)
+  sass (~> 3.1.1)
   serve (~> 1.0.0)

config.rb

@@ -17,6 +17,7 @@
 
 # Set to true for easier debugging
 line_comments         = false
+preferred_syntax      = :sass
 
 # CSS output style - :nested, :expanded, :compact, or :compressed
 output_style          = :expanded

config.ru

@@ -14,13 +14,13 @@ root = ::File.dirname(__FILE__)
 
 # Set the haml options
 # http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#options
-class Haml::Engine
-  alias old_initialize initialize
-  def initialize(lines, options)
-    options.update(:format => :html5)
-    old_initialize(lines, options)
-  end
-end
+# class Haml::Engine
+#   alias old_initialize initialize
+#   def initialize(lines, options)
+#     options.update(:format => :html5)
+#     old_initialize(lines, options)
+#   end
+# end
 
 # Compass
 Compass.add_project_configuration(root + '/config.rb')