From 0518f0d293a6f2d38b99601f72a497111c1e8b97 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Fri, 3 Jun 2011 15:06:02 -0700
Subject: [PATCH 1/4] Fix encoding issue.

---
 .../stylesheets/compass/css3/_font-face.scss   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/frameworks/compass/stylesheets/compass/css3/_font-face.scss b/frameworks/compass/stylesheets/compass/css3/_font-face.scss
index b110d25a..6c7d511c 100644
--- a/frameworks/compass/stylesheets/compass/css3/_font-face.scss
+++ b/frameworks/compass/stylesheets/compass/css3/_font-face.scss
@@ -12,7 +12,10 @@
 //
 // If you need to generate other formats check out the Font Squirrel
 // [font generator](http://www.fontsquirrel.com/fontface/generator)
-
+//
+// Example:
+//
+//     +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot")
 @mixin font-face(
   $name, 
   $font-files, 
@@ -28,16 +31,3 @@
     src: $font-files; 
   }
 }
-
-// EXAMPLE
-// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot")
-//
-// will generate:
-//
-//   @font-face { 
-//     font-family: 'this name'; 
-//     src: url('fonts/this.eot'); 
-//     src: local("☺"),
-//       url('fonts/this.otf') format('woff'), 
-//       url('fonts/this.woff') format('opentype'); 
-//   }

From d80dde727a0503be013ee745ecbd64c7e3dc9b31 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Fri, 3 Jun 2011 15:29:47 -0700
Subject: [PATCH 2/4] This file has utf-8 chars in the comments.

---
 frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss b/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss
index 1822bb11..b4b9cfd0 100644
--- a/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss
+++ b/frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss
@@ -1,3 +1,4 @@
+@charset "utf-8";
 @import "typography";
 
 $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif !default;

From bfba73c1e368955dcd25a8e31b3c8a40c9071ee2 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Tue, 7 Jun 2011 11:22:33 -0700
Subject: [PATCH 3/4] Ignore charset in blueprint files

---
 test/integrations/compass_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integrations/compass_test.rb b/test/integrations/compass_test.rb
index ebe2bc54..c8f4f5f8 100644
--- a/test/integrations/compass_test.rb
+++ b/test/integrations/compass_test.rb
@@ -57,7 +57,7 @@ class CompassTest < Test::Unit::TestCase
         assert_no_errors css_file, :blueprint
       end
       each_sass_file do |sass_file|
-        assert_renders_correctly sass_file
+        assert_renders_correctly sass_file, :ignore_charset => true
       end
     end
   end

From f49120c1c8f0dc58bb0d478e1b833b4e1afcfdc5 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Tue, 7 Jun 2011 11:23:06 -0700
Subject: [PATCH 4/4] Revert "Disable 1.8.7 and rbx for now."

This reverts commit 7d90dfe4a0540690e394e0c143fb5921d2fa673c.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9f7820b4..720da5df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 rvm:
+  - 1.8.7
   - 1.9.2
   - jruby
+  - rbx
   - ree