From f022a7be8bcc307995ada564a9114c3f209432e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Sun, 4 Mar 2018 12:07:26 +0100 Subject: [PATCH] Fix `@font-face` URLs in SCSS --- scss/_path.scss | 14 +++++++------- src/doc/assets/fork-awesome/scss/_path.scss | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scss/_path.scss b/scss/_path.scss index a1a6d04d1..5480425ea 100644 --- a/scss/_path.scss +++ b/scss/_path.scss @@ -3,13 +3,13 @@ @font-face { font-family: '#{$fa-font-family}'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); -// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('#{$fa-font-path}/forkawesome-webfont.eot?v=#{$fa-version}'); + src: url('#{$fa-font-path}/forkawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), + url('#{$fa-font-path}/forkawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), + url('#{$fa-font-path}/forkawesome-webfont.woff?v=#{$fa-version}') format('woff'), + url('#{$fa-font-path}/forkawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), + url('#{$fa-font-path}/forkawesome-webfont.svg?v=#{$fa-version}#forkawesomeregular') format('svg'); +// src: url('#{$fa-font-path}/ForkAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/src/doc/assets/fork-awesome/scss/_path.scss b/src/doc/assets/fork-awesome/scss/_path.scss index a1a6d04d1..5480425ea 100644 --- a/src/doc/assets/fork-awesome/scss/_path.scss +++ b/src/doc/assets/fork-awesome/scss/_path.scss @@ -3,13 +3,13 @@ @font-face { font-family: '#{$fa-font-family}'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); -// src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: url('#{$fa-font-path}/forkawesome-webfont.eot?v=#{$fa-version}'); + src: url('#{$fa-font-path}/forkawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), + url('#{$fa-font-path}/forkawesome-webfont.woff2?v=#{$fa-version}') format('woff2'), + url('#{$fa-font-path}/forkawesome-webfont.woff?v=#{$fa-version}') format('woff'), + url('#{$fa-font-path}/forkawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), + url('#{$fa-font-path}/forkawesome-webfont.svg?v=#{$fa-version}#forkawesomeregular') format('svg'); +// src: url('#{$fa-font-path}/ForkAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; }