Skip to content
This repository has been archived by the owner on Apr 30, 2020. It is now read-only.

Commit

Permalink
fix(Components/DocumentDefault): add woff2 option to fontFace helper (#…
Browse files Browse the repository at this point in the history
…197)

to fix console error with slick font loading
  • Loading branch information
Doğa Gürdal authored May 24, 2017
1 parent 9383082 commit d90fb64
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions Components/DocumentDefault/BaseStyles/Mixins/_fontFace.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
fontFace($family, $file, $weight = 'normal', $style = 'normal', $basePath = '../../Components/DocumentDefault/Fonts/')
fontFace($family, $file, $weight = 'normal', $style = 'normal', $woff2 = true, $basePath = '../../Components/DocumentDefault/Fonts/')
@font-face
font-family: $family
src: url($basePath + $file + '.woff2') format('woff2'), url($basePath + $file + '.woff') format('woff'), url($basePath + $file + '.ttf') format('truetype')
if $woff2
src: url($basePath + $file + '.woff2') format('woff2'), url($basePath + $file + '.woff') format('woff'), url($basePath + $file + '.ttf') format('truetype')
else
src: url($basePath + $file + '.woff') format('woff'), url($basePath + $file + '.ttf') format('truetype')
font-style: unquote($style)
font-weight: unquote($weight)
2 changes: 1 addition & 1 deletion Components/SliderMedia/style.styl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $rupture.anti-overlap = lookup('$globalRuptureAntiOverlap') || -1px
$containerPadding = lookup('$globalContainerPadding') || 15px
$containerMaxWidth = lookup('$globalContainerMaxWidth') || 1140px

fontFace('slick', 'slick', normal, normal, '../../vendor/slick/')
fontFace('slick', 'slick', normal, normal, false, '../../vendor/slick/')

.flyntComponent[is='flynt-slider-media']
*,
Expand Down

0 comments on commit d90fb64

Please # to comment.