Merge remote-tracking branch 'origin/master' into stable

Compass · Aug 18, 2014 · ef2d442 · ef2d442
2 parents 3781c00 + 74d0830
commit ef2d442
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cli/test/units/sass_extensions_test.rb b/cli/test/units/sass_extensions_test.rb
@@ -136,7 +136,7 @@ def test_css2_fallback
 
   def test_font_files
     assert_equal '', evaluate('font_files()')
-    assert_equal "url(/font/name.woff) format('woff'), url(/fonts/name.ttf) format('truetype'), url(/fonts/name.svg#fontpath) format('svg')", evaluate("font-files('/font/name.woff', woff, '/fonts/name.ttf', truetype, '/fonts/name.svg#fontpath', svg)")
+    assert_equal "url(/font/name.woff) format('woff'), url(/font/name.woff2) format('woff2'), url(/fonts/name.ttf) format('truetype'), url(/fonts/name.svg#fontpath) format('svg')", evaluate("font-files('/font/name.woff', woff, '/font/name.woff2', woff2, '/fonts/name.ttf', truetype, '/fonts/name.svg#fontpath', svg)")
 
     assert_equal "url(/font/with/right_ext.woff) format('woff')", evaluate("font_files('/font/with/right_ext.woff')")
     assert_equal "url(/font/with/wrong_ext.woff) format('svg')", evaluate("font_files('/font/with/wrong_ext.woff', 'svg')")

diff --git a/core/lib/compass/core/sass_extensions/functions/font_files.rb b/core/lib/compass/core/sass_extensions/functions/font_files.rb
@@ -1,6 +1,7 @@
 module Compass::Core::SassExtensions::Functions::FontFiles
   FONT_TYPES = {
     :woff => 'woff',
+    :woff2 => 'woff2',
     :otf => 'opentype',
     :opentype => 'opentype',
     :ttf => 'truetype',