diff --git a/src/_includes/global/baselayout.njk b/src/_includes/global/baselayout.njk index 8b66be79..50279ed8 100644 --- a/src/_includes/global/baselayout.njk +++ b/src/_includes/global/baselayout.njk @@ -11,9 +11,7 @@ {% include "global/feeds.njk" %} {# Fonts #} - {% include "global/fontdefault.njk" %} - - + {% include "global/fonts.njk" %} {# CSS #} {% include "global/css-bundle.njk" %} diff --git a/src/_includes/global/fontdefault.njk b/src/_includes/global/fonts.njk similarity index 91% rename from src/_includes/global/fontdefault.njk rename to src/_includes/global/fonts.njk index cbabcf5e..9c4d47f0 100644 --- a/src/_includes/global/fontdefault.njk +++ b/src/_includes/global/fonts.njk @@ -15,4 +15,5 @@ font-weight: 700; src: url('/assets/fonts/lexend/lexend-v19-latin-700.woff2') format('woff2'); } - \ No newline at end of file + + \ No newline at end of file diff --git a/src/_includes/misc/base.njk b/src/_includes/misc/base.njk index 4f3800cb..c086d526 100644 --- a/src/_includes/misc/base.njk +++ b/src/_includes/misc/base.njk @@ -13,7 +13,7 @@ {% include "global/feeds.njk" %} {# Style #} - {% include "global/fontdefault.njk" %} + {% include "global/fonts.njk" %} {# Favicon #} diff --git a/src/assets/fonts/intel-one-mono.css b/src/assets/fonts/fonts.css similarity index 75% rename from src/assets/fonts/intel-one-mono.css rename to src/assets/fonts/fonts.css index 7013ec21..b103a175 100644 --- a/src/assets/fonts/intel-one-mono.css +++ b/src/assets/fonts/fonts.css @@ -1,3 +1,19 @@ +/* Lexend */ +@font-face { + font-display: swap; + font-family: 'Lexend'; + font-style: normal; + font-weight: 600; + src: url('/assets/fonts/lexend/lexend-v19-latin-600.woff2') format('woff2'); +} +@font-face { + font-display: swap; + font-family: 'Lexend'; + font-style: normal; + font-weight: 900; + src: url('/assets/fonts/lexend/lexend-v19-latin-900.woff2') format('woff2'); +} +/* Intel One Mono */ @font-face { font-display: swap; font-family: 'Intel One Mono'; @@ -13,7 +29,6 @@ font-weight: 400; src: url('/assets/fonts/intel-one-mono/IntelOneMono-Italic.woff2') format('woff2'); } - @font-face { font-display: swap; font-family: 'Intel One Mono'; @@ -21,7 +36,6 @@ font-weight: 600; src: url('/assets/fonts/intel-one-mono/IntelOneMono-Medium.woff2') format('woff2'); } - @font-face { font-display: swap; font-family: 'Intel One Mono'; @@ -29,7 +43,6 @@ font-weight: 600; src: url('/assets/fonts/intel-one-mono/IntelOneMono-MediumItalic.woff2') format('woff2'); } - @font-face { font-display: swap; font-family: 'Intel One Mono'; @@ -37,11 +50,10 @@ font-weight: 700; src: url('/assets/fonts/intel-one-mono/IntelOneMono-Bold.woff2') format('woff2'); } - @font-face { font-display: swap; font-family: 'Intel One Mono'; font-style: italic; font-weight: 700; src: url('/assets/fonts/intel-one-mono/IntelOneMono-BoldItalic.woff2') format('woff2'); -} +} \ No newline at end of file diff --git a/src/assets/fonts/lexend.css b/src/assets/fonts/lexend.css deleted file mode 100644 index 49b57433..00000000 --- a/src/assets/fonts/lexend.css +++ /dev/null @@ -1,14 +0,0 @@ -@font-face { - font-display: swap; - font-family: 'Lexend'; - font-style: normal; - font-weight: 600; - src: url('/assets/fonts/lexend/lexend-v19-latin-600.woff2') format('woff2'); -} -@font-face { - font-display: swap; - font-family: 'Lexend'; - font-style: normal; - font-weight: 900; - src: url('/assets/fonts/lexend/lexend-v19-latin-900.woff2') format('woff2'); -} \ No newline at end of file