From f7ac7f14da2f660987136430660e36fb54909f31 Mon Sep 17 00:00:00 2001 From: horhik Date: Fri, 22 May 2020 09:13:13 +0300 Subject: [PATCH] fix fonts --- .idea/workspace.xml | 11 +++-------- src/css/basic.scss | 1 + src/css/fonts.scss | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 92c3fcb..e075ca6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,14 +11,9 @@ - - - - - - - + + @@ -114,7 +109,7 @@ - + diff --git a/src/css/basic.scss b/src/css/basic.scss index f7d82a7..fc2171d 100644 --- a/src/css/basic.scss +++ b/src/css/basic.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "fonts"; body { diff --git a/src/css/fonts.scss b/src/css/fonts.scss index 5c2692c..0b01833 100644 --- a/src/css/fonts.scss +++ b/src/css/fonts.scss @@ -1,7 +1,7 @@ @font-face { font-family: 'Mononoki'; src: url('fonts/mononoki-Regular.eot'); - src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'); + src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'), url('fonts/mononoki-Regular.ttf') format('truetype'), url('fonts/mononoki-Regular.woff2') format('woff2'), url('fonts/mononoki-Regular.woff') format('woff') @@ -10,7 +10,7 @@ @font-face { font-family: 'Mononoki Bold'; src: url('fonts/mononoki-Bold.eot'); - src: url('fonts/mononoki-Bold.eot') format('embedded-opentype'); + src: url('fonts/mononoki-Bold.eot') format('embedded-opentype'), url('fonts/mononoki-Bold.ttf') format('truetype'), url('fonts/mononoki-Bold.woff2') format('woff2'), url('fonts/mononoki-Bold.woff') format('woff') @@ -19,7 +19,7 @@ url('fonts/mononoki-Bold.woff') format('woff') @font-face { font-family: 'Mononoki'; src: url('fonts/mononoki-Regular.eot'); - src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'); + src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'), url('fonts/mononoki-Regular.ttf') format('truetype'), url('fonts/mononoki-Regular.woff2') format('woff2'), url('fonts/mononoki-Regular.woff') format('woff')