From 0702d13263bf501c1db074ce1544e60b95161210 Mon Sep 17 00:00:00 2001 From: "bozo.kopic" Date: Sun, 7 Nov 2021 15:52:44 +0100 Subject: major rewrite --- src_scss/fonts/_font.scss | 9 --------- src_scss/fonts/fontawesome.scss | 9 ++++++--- src_scss/fonts/inter.scss | 8 ++++++++ src_scss/fonts/roboto.scss | 15 --------------- 4 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 src_scss/fonts/_font.scss create mode 100644 src_scss/fonts/inter.scss delete mode 100644 src_scss/fonts/roboto.scss (limited to 'src_scss/fonts') diff --git a/src_scss/fonts/_font.scss b/src_scss/fonts/_font.scss deleted file mode 100644 index 3f4e7e7..0000000 --- a/src_scss/fonts/_font.scss +++ /dev/null @@ -1,9 +0,0 @@ - -@mixin font($variant, $type, $weight, $style) { - @font-face { - font-family: '#{$variant}'; - src: url('../../fonts/#{$variant}/#{$variant}-#{$type}.woff2') format('truetype'); - font-weight: $weight; - font-style: $style; - } -} diff --git a/src_scss/fonts/fontawesome.scss b/src_scss/fonts/fontawesome.scss index bfac549..5d628ba 100644 --- a/src_scss/fonts/fontawesome.scss +++ b/src_scss/fonts/fontawesome.scss @@ -1,7 +1,10 @@ -@import "font"; - -@include font('FontAwesome', 'webfont', normal, normal); +@font-face { + font-family: 'FontAwesome'; + src: url('fonts/FontAwesome/FontAwesome.woff2') format('woff2'); + font-weight: normal; + font-style: normal; +} .fa { display: inline-block; diff --git a/src_scss/fonts/inter.scss b/src_scss/fonts/inter.scss new file mode 100644 index 0000000..4863b74 --- /dev/null +++ b/src_scss/fonts/inter.scss @@ -0,0 +1,8 @@ + +@font-face { + font-family: 'Inter'; + src: url('fonts/Inter/Inter.woff2') format('woff2'); + font-weight: 100 900; + font-style: oblique 0deg 10deg; + font-display: swap; +} diff --git a/src_scss/fonts/roboto.scss b/src_scss/fonts/roboto.scss deleted file mode 100644 index 184ad61..0000000 --- a/src_scss/fonts/roboto.scss +++ /dev/null @@ -1,15 +0,0 @@ -@import "font"; - - -@include font('Roboto', 'Black', 900, normal); -@include font('Roboto', 'BlackItalic', 900, italic); -@include font('Roboto', 'Bold', 700, normal); -@include font('Roboto', 'BoldItalic', 700, italic); -@include font('Roboto', 'Medium', 500, normal); -@include font('Roboto', 'MediumItalic', 500, italic); -@include font('Roboto', 'Regular', 400, normal); -@include font('Roboto', 'RegularItalic', 400, italic); -@include font('Roboto', 'Light', 300, normal); -@include font('Roboto', 'LightItalic', 300, italic); -@include font('Roboto', 'Thin', 100, normal); -@include font('Roboto', 'ThinItalic', 100, italic); -- cgit v1.2.3-70-g09d2