From fa145a5fce51fd84bed8019f5af4c848f3d472c9 Mon Sep 17 00:00:00 2001
From: Helen Chong <119173961+helenclx@users.noreply.github.com>
Date: Sun, 6 Oct 2024 15:37:57 +0800
Subject: [PATCH] Reorganise font families
---
src/_includes/global/baselayout.njk | 2 +-
src/assets/css/general.css | 4 ++--
src/assets/css/global.css | 4 ++--
src/assets/fonts/{intel-one-mono => }/intel-one-mono.css | 0
4 files changed, 5 insertions(+), 5 deletions(-)
rename src/assets/fonts/{intel-one-mono => }/intel-one-mono.css (100%)
diff --git a/src/_includes/global/baselayout.njk b/src/_includes/global/baselayout.njk
index 68cd0c7e..57d17985 100644
--- a/src/_includes/global/baselayout.njk
+++ b/src/_includes/global/baselayout.njk
@@ -12,7 +12,7 @@
{# Fonts #}
{% include "global/fontdefault.njk" %}
-
+
{# CSS #}
{% include "global/css-bundle.njk" %}
diff --git a/src/assets/css/general.css b/src/assets/css/general.css
index 66784819..8093af7e 100644
--- a/src/assets/css/general.css
+++ b/src/assets/css/general.css
@@ -3,7 +3,7 @@ body {
display: flex;
align-items: center;
flex-direction: column;
- font-family: var(--ff-default), Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif;
+ font-family: var(--ff-default);
color: var(--clr-body-txt);
background-color: var(--clr-body-bg);
}
@@ -92,7 +92,7 @@ figcaption {
}
code {
- font-family: var(--ff-monospace), ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;
+ font-family: var(--ff-monospace);
word-break: break-word;
}
diff --git a/src/assets/css/global.css b/src/assets/css/global.css
index 395ba97e..0a849db1 100644
--- a/src/assets/css/global.css
+++ b/src/assets/css/global.css
@@ -34,8 +34,8 @@
--clr-mod-entry-bg: #241445;
- --ff-default: 'Lexend';
- --ff-monospace: 'Inter One Mono';
+ --ff-default: 'Lexend', Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif;
+ --ff-monospace: 'Intel One Mono', ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace;
--fs-main: 1.2rem;
--fs-h1: clamp(2rem, 1rem + 5vw, 3rem);
diff --git a/src/assets/fonts/intel-one-mono/intel-one-mono.css b/src/assets/fonts/intel-one-mono.css
similarity index 100%
rename from src/assets/fonts/intel-one-mono/intel-one-mono.css
rename to src/assets/fonts/intel-one-mono.css