From 5c0f73793e2300f0def713119a972a6997baea5e Mon Sep 17 00:00:00 2001 From: Hanzei Date: Thu, 12 Jul 2018 14:42:54 +0200 Subject: [PATCH] Relocate fonts --- assets/sass/_fonts.sass | 14 ++++++++------ .../fonts/{ => NunitoSans}/NunitoSans-Black.ttf | Bin .../{ => NunitoSans}/NunitoSans-BlackItalic.ttf | Bin static/fonts/{ => NunitoSans}/NunitoSans-Bold.ttf | Bin .../{ => NunitoSans}/NunitoSans-BoldItalic.ttf | Bin .../{ => NunitoSans}/NunitoSans-ExtraBold.ttf | Bin .../NunitoSans-ExtraBoldItalic.ttf | Bin .../{ => NunitoSans}/NunitoSans-ExtraLight.ttf | Bin .../NunitoSans-ExtraLightItalic.ttf | Bin .../fonts/{ => NunitoSans}/NunitoSans-Italic.ttf | Bin .../fonts/{ => NunitoSans}/NunitoSans-Light.ttf | Bin .../{ => NunitoSans}/NunitoSans-LightItalic.ttf | Bin .../fonts/{ => NunitoSans}/NunitoSans-Regular.ttf | Bin .../{ => NunitoSans}/NunitoSans-SemiBold.ttf | Bin .../NunitoSans-SemiBoldItalic.ttf | Bin static/fonts/{ => NunitoSans}/OFL.txt | 0 16 files changed, 8 insertions(+), 6 deletions(-) rename static/fonts/{ => NunitoSans}/NunitoSans-Black.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-BlackItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-Bold.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-BoldItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-ExtraBold.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-ExtraBoldItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-ExtraLight.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-ExtraLightItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-Italic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-Light.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-LightItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-Regular.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-SemiBold.ttf (100%) rename static/fonts/{ => NunitoSans}/NunitoSans-SemiBoldItalic.ttf (100%) rename static/fonts/{ => NunitoSans}/OFL.txt (100%) diff --git a/assets/sass/_fonts.sass b/assets/sass/_fonts.sass index b2007cd..d4dc17e 100644 --- a/assets/sass/_fonts.sass +++ b/assets/sass/_fonts.sass @@ -1,23 +1,25 @@ +$nunito-font-path: "/fonts/NunitoSans" + /* vietnamese */ @font-face font-family: 'Nunito Sans' font-style: normal - font-weight: 400 - src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2') + font-weight: normal + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format('woff2') unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB /* latin-ext */ @font-face font-family: 'Nunito Sans' font-style: normal - font-weight: 400 - src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2') + font-weight: normal + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format('woff2') unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF /* latin */ @font-face font-family: 'Nunito Sans' font-style: normal - font-weight: 400 - src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(../fonts/NunitoSans-Regular.ttf) format('woff2') + font-weight: normal + src: local('Nunito Sans Regular'), local('NunitoSans-Regular'), url(#{$nunito-font-path}/NunitoSans-Regular.ttf) format('woff2') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD diff --git a/static/fonts/NunitoSans-Black.ttf b/static/fonts/NunitoSans/NunitoSans-Black.ttf similarity index 100% rename from static/fonts/NunitoSans-Black.ttf rename to static/fonts/NunitoSans/NunitoSans-Black.ttf diff --git a/static/fonts/NunitoSans-BlackItalic.ttf b/static/fonts/NunitoSans/NunitoSans-BlackItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-BlackItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-BlackItalic.ttf diff --git a/static/fonts/NunitoSans-Bold.ttf b/static/fonts/NunitoSans/NunitoSans-Bold.ttf similarity index 100% rename from static/fonts/NunitoSans-Bold.ttf rename to static/fonts/NunitoSans/NunitoSans-Bold.ttf diff --git a/static/fonts/NunitoSans-BoldItalic.ttf b/static/fonts/NunitoSans/NunitoSans-BoldItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-BoldItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-BoldItalic.ttf diff --git a/static/fonts/NunitoSans-ExtraBold.ttf b/static/fonts/NunitoSans/NunitoSans-ExtraBold.ttf similarity index 100% rename from static/fonts/NunitoSans-ExtraBold.ttf rename to static/fonts/NunitoSans/NunitoSans-ExtraBold.ttf diff --git a/static/fonts/NunitoSans-ExtraBoldItalic.ttf b/static/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-ExtraBoldItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf diff --git a/static/fonts/NunitoSans-ExtraLight.ttf b/static/fonts/NunitoSans/NunitoSans-ExtraLight.ttf similarity index 100% rename from static/fonts/NunitoSans-ExtraLight.ttf rename to static/fonts/NunitoSans/NunitoSans-ExtraLight.ttf diff --git a/static/fonts/NunitoSans-ExtraLightItalic.ttf b/static/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-ExtraLightItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf diff --git a/static/fonts/NunitoSans-Italic.ttf b/static/fonts/NunitoSans/NunitoSans-Italic.ttf similarity index 100% rename from static/fonts/NunitoSans-Italic.ttf rename to static/fonts/NunitoSans/NunitoSans-Italic.ttf diff --git a/static/fonts/NunitoSans-Light.ttf b/static/fonts/NunitoSans/NunitoSans-Light.ttf similarity index 100% rename from static/fonts/NunitoSans-Light.ttf rename to static/fonts/NunitoSans/NunitoSans-Light.ttf diff --git a/static/fonts/NunitoSans-LightItalic.ttf b/static/fonts/NunitoSans/NunitoSans-LightItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-LightItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-LightItalic.ttf diff --git a/static/fonts/NunitoSans-Regular.ttf b/static/fonts/NunitoSans/NunitoSans-Regular.ttf similarity index 100% rename from static/fonts/NunitoSans-Regular.ttf rename to static/fonts/NunitoSans/NunitoSans-Regular.ttf diff --git a/static/fonts/NunitoSans-SemiBold.ttf b/static/fonts/NunitoSans/NunitoSans-SemiBold.ttf similarity index 100% rename from static/fonts/NunitoSans-SemiBold.ttf rename to static/fonts/NunitoSans/NunitoSans-SemiBold.ttf diff --git a/static/fonts/NunitoSans-SemiBoldItalic.ttf b/static/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf similarity index 100% rename from static/fonts/NunitoSans-SemiBoldItalic.ttf rename to static/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf diff --git a/static/fonts/OFL.txt b/static/fonts/NunitoSans/OFL.txt similarity index 100% rename from static/fonts/OFL.txt rename to static/fonts/NunitoSans/OFL.txt