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 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; 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'); -// } 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