Merge branch 'sass-mixins'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "public/stylesheets/sass/sass-mixins"]
+	path = public/stylesheets/sass/sass-mixins
+	url = git@github.com:thoughtbot/sass-mixins.git

flutie.gemspec

@@ -8,5 +8,5 @@ Gem::Specification.new do |s|
   s.description = 'Flutie is a starting point for personal discovery'
   s.files = ["README*", "Rakefile", "{app,config,lib,public}/**/*"].map { |glob| Dir[glob] }.flatten
   s.authors = ['Chad Pytel', 'Kevin Burg', 'Matt Jankowski', 'Mike Burns', 'Fred Yates']
-  s.add_development_dependency('haml')
+  s.add_development_dependency('sass')
 end

public/stylesheets/flutie.css

@@ -78,9 +78,6 @@ hr {
 input, select {
   vertical-align: middle; }
 
-/* this hack is courtesy of gbbowers on github
-   https://gist.github.com/601810 */
-/* Useful with form inputs and textareas */
 /* Legacy support for inline-block in IE7 (maybe IE6) */
 body {
   color: #222;

public/stylesheets/sass/flutie.scss

@@ -1,10 +1,5 @@
 @import 'reset';
-@import 'border-radius';
-@import 'box-shadow';
-@import 'box-sizing';
-@import 'inline-block';
-@import 'transition';
-@import 'linear-gradient';
+@import 'sass-mixins/mixins';
 @import 'defaults';
 @import 'type';
 @import 'forms';

test/dummy/config/application.rb

@@ -6,7 +6,7 @@
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-require 'haml'
+require 'sass'
 require 'flutie'
 
 module Dummy