Combine font stylesheets

This commit is contained in:
Helen Chong 2024-10-06 20:01:08 +08:00
parent a61f8f5e6d
commit d5dd669496
5 changed files with 21 additions and 24 deletions

View File

@ -11,9 +11,7 @@
{% include "global/feeds.njk" %} {% include "global/feeds.njk" %}
{# Fonts #} {# Fonts #}
{% include "global/fontdefault.njk" %} {% include "global/fonts.njk" %}
<link rel="stylesheet" href="/assets/fonts/lexend.css">
<link rel="stylesheet" href="/assets/fonts/intel-one-mono.css">
{# CSS #} {# CSS #}
{% include "global/css-bundle.njk" %} {% include "global/css-bundle.njk" %}

View File

@ -15,4 +15,5 @@
font-weight: 700; font-weight: 700;
src: url('/assets/fonts/lexend/lexend-v19-latin-700.woff2') format('woff2'); src: url('/assets/fonts/lexend/lexend-v19-latin-700.woff2') format('woff2');
} }
</style> </style>
<link rel="stylesheet" href="/assets/fonts/fonts.css">

View File

@ -13,7 +13,7 @@
{% include "global/feeds.njk" %} {% include "global/feeds.njk" %}
{# Style #} {# Style #}
{% include "global/fontdefault.njk" %} {% include "global/fonts.njk" %}
<link rel="stylesheet" href="/assets/css/misc.css"> <link rel="stylesheet" href="/assets/css/misc.css">
{# Favicon #} {# Favicon #}

View File

@ -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-face {
font-display: swap; font-display: swap;
font-family: 'Intel One Mono'; font-family: 'Intel One Mono';
@ -13,7 +29,6 @@
font-weight: 400; font-weight: 400;
src: url('/assets/fonts/intel-one-mono/IntelOneMono-Italic.woff2') format('woff2'); src: url('/assets/fonts/intel-one-mono/IntelOneMono-Italic.woff2') format('woff2');
} }
@font-face { @font-face {
font-display: swap; font-display: swap;
font-family: 'Intel One Mono'; font-family: 'Intel One Mono';
@ -21,7 +36,6 @@
font-weight: 600; font-weight: 600;
src: url('/assets/fonts/intel-one-mono/IntelOneMono-Medium.woff2') format('woff2'); src: url('/assets/fonts/intel-one-mono/IntelOneMono-Medium.woff2') format('woff2');
} }
@font-face { @font-face {
font-display: swap; font-display: swap;
font-family: 'Intel One Mono'; font-family: 'Intel One Mono';
@ -29,7 +43,6 @@
font-weight: 600; font-weight: 600;
src: url('/assets/fonts/intel-one-mono/IntelOneMono-MediumItalic.woff2') format('woff2'); src: url('/assets/fonts/intel-one-mono/IntelOneMono-MediumItalic.woff2') format('woff2');
} }
@font-face { @font-face {
font-display: swap; font-display: swap;
font-family: 'Intel One Mono'; font-family: 'Intel One Mono';
@ -37,11 +50,10 @@
font-weight: 700; font-weight: 700;
src: url('/assets/fonts/intel-one-mono/IntelOneMono-Bold.woff2') format('woff2'); src: url('/assets/fonts/intel-one-mono/IntelOneMono-Bold.woff2') format('woff2');
} }
@font-face { @font-face {
font-display: swap; font-display: swap;
font-family: 'Intel One Mono'; font-family: 'Intel One Mono';
font-style: italic; font-style: italic;
font-weight: 700; font-weight: 700;
src: url('/assets/fonts/intel-one-mono/IntelOneMono-BoldItalic.woff2') format('woff2'); src: url('/assets/fonts/intel-one-mono/IntelOneMono-BoldItalic.woff2') format('woff2');
} }

View File

@ -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');
}