woff2 support

twbs · Jan 17, 2015 · 3e33c6f · 3e33c6f
1 parent 64211e6
commit 3e33c6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/bootstrap-sass/engine.rb b/lib/bootstrap-sass/engine.rb
@@ -5,7 +5,7 @@ class Engine < ::Rails::Engine
         %w(stylesheets javascripts fonts images).each do |sub|
           app.config.assets.paths << root.join('assets', sub).to_s
         end
-        app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
+        app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
       end
     end
   end

diff --git a/tasks/converter/fonts_conversion.rb b/tasks/converter/fonts_conversion.rb
@@ -10,7 +10,7 @@ def process_font_assets
     end
 
     def bootstrap_font_files
-      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff)$/)
+      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff2?)$/)
     end
   end
 end
diff --git a/test/sprockets_rails_test.rb b/test/sprockets_rails_test.rb
@@ -16,7 +16,7 @@ def test_sprockets_digest_asset_refs
     assert compiled, 'Could not precompile assets'
     Dir.glob(File.join(root, 'public', 'assets', 'app*.{css,js}')) do |path|
       File.open(path, 'r') do |f|
-        f.read.scan /url\("?[^"]+\.(?:jpg|png|eot|woff|ttf|svg)[^"]*"?\)/ do |m|
+        f.read.scan /url\("?[^"]+\.(?:jpg|png|eot|woff2?|ttf|svg)[^"]*"?\)/ do |m|
           assert_match /-[0-9a-f]{12,}\./, m
         end
       end