stylesheets/toolkit/_fonts.scss in toolkit-2.7.0 vs stylesheets/toolkit/_fonts.scss in toolkit-2.8.0
- old
+ new
@@ -28,15 +28,15 @@
$inline-woff: if($inline-woff != null, $inline-woff, toolkit-get('font face inline woff'));
$font-stack: ();
$font-src: '';
$eot: false;
- $font-extensions: ('eot': 'embedded-opentype', 'woff': 'woff', 'ttf': 'truetype', 'svg': 'svg');
+ $font-extensions: ('eot': 'embedded-opentype', 'woff2': 'woff2', 'woff': 'woff', 'ttf': 'truetype', 'svg': 'svg');
@each $ext, $format in $font-extensions {
@if map-has-key($files, $ext) {
- @if function-exists(inline-font-files) and $inline-woff == true and $ext == 'woff' {
+ @if function-exists(inline-font-files) and $inline-woff == true and ($ext == 'woff' or $ext == 'woff2') {
$font-src: inline-font-files(map-get($files, $ext));
}
@else if function-exists(font-url) {
$font-src: font-url(map-get($files, $ext)) format($format);
@if $ext == 'eot' {
@@ -131,6 +131,6 @@
#{$loading} & {
opacity: 0;
}
}
-}
\ No newline at end of file
+}