From 6b5fa15f2ca366939760e3a9d894a18d3f1098df Mon Sep 17 00:00:00 2001 From: Foster Hangdaan Date: Thu, 27 Jul 2023 22:51:48 -0400 Subject: [PATCH] Refactored fonts - Added fonts as static assets. We no longer depend the client's system to have the fonts installed. - Moved site wide monospace and sans-serif font families to a global variable. --- _config.ts | 2 ++ _includes/styles/base.scss | 6 ++--- _includes/styles/fonts.scss | 24 +++++++++++++++++++ _includes/styles/variables.scss | 4 ++++ .../CaskaydiaCoveNerdFontMono-Regular.ttf | 3 +++ static/fonts/UbuntuNerdFont-Bold.ttf | 3 +++ static/fonts/UbuntuNerdFont-Italic.ttf | 3 +++ static/fonts/UbuntuNerdFont-Regular.ttf | 3 +++ styles/main.scss | 1 + 9 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 _includes/styles/fonts.scss create mode 100644 static/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf create mode 100644 static/fonts/UbuntuNerdFont-Bold.ttf create mode 100644 static/fonts/UbuntuNerdFont-Italic.ttf create mode 100644 static/fonts/UbuntuNerdFont-Regular.ttf diff --git a/_config.ts b/_config.ts index b37f638..402a571 100644 --- a/_config.ts +++ b/_config.ts @@ -11,6 +11,8 @@ const site = lume({ site.ignore("README.md", "LICENSE.txt"); +site.copy("static", "."); + site.use(jsx()); site.use(nav()); site.use(sass()); diff --git a/_includes/styles/base.scss b/_includes/styles/base.scss index 11e609b..b90eaee 100644 --- a/_includes/styles/base.scss +++ b/_includes/styles/base.scss @@ -10,7 +10,7 @@ body { color: var(--color-fg); background: var(--color-bg); transition: color 0.5s, background-color 0.5s; - font-family: Ubuntu Nerd Font, Ubuntu, Inter, -apple-system, BlinkMacSystemFont, sans-serif; + font-family: var(--font--sans-serif); font-size: var(--text-base); text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; @@ -75,9 +75,9 @@ pre { overflow: auto; page-break-inside: avoid; word-wrap: break-word; - font-family: CaskaydiaCove Nerd Font Mono, monospace; + font-family: var(--font--mono); code { - font-family: CaskaydiaCove Nerd Font Mono, monospace; + font-family: var(--font--mono); } } diff --git a/_includes/styles/fonts.scss b/_includes/styles/fonts.scss new file mode 100644 index 0000000..8b6c647 --- /dev/null +++ b/_includes/styles/fonts.scss @@ -0,0 +1,24 @@ +@font-face { + font-family: "Ubuntu Nerd Font"; + font-weight: normal; + src: url("/fonts/UbuntuNerdFont-Regular.ttf") format("truetype"); +} + +@font-face { + font-family: "Ubuntu Nerd Font"; + font-style: italic; + font-weight: normal; + src: url("/fonts/UbuntuNerdFont-Italic.ttf") format("truetype"); +} + +@font-face { + font-family: "Ubuntu Nerd Font"; + font-weight: bold; + src: url("/fonts/UbuntuNerdFont-Bold.ttf") format("truetype"); +} + +@font-face { + font-family: "CaskaydiaCove Nerd Font Mono"; + font-weight: normal; + src: url("/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf") format("truetype"); +} diff --git a/_includes/styles/variables.scss b/_includes/styles/variables.scss index a52dd8f..47823ca 100644 --- a/_includes/styles/variables.scss +++ b/_includes/styles/variables.scss @@ -23,4 +23,8 @@ :root { /* Widths */ --page--max-width: 48rem; + + /* Fonts */ + --font--sans-serif: Ubuntu Nerd Font, Ubuntu, Inter, -apple-system, BlinkMacSystemFont, sans-serif; + --font--mono: CaskaydiaCove Nerd Font Mono, monospace; } diff --git a/static/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf b/static/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf new file mode 100644 index 0000000..58d9ed5 --- /dev/null +++ b/static/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22feafcbebc578b2e0beddfe1ff53e1ba494723d38686fd8f4b9db321932432a +size 2255384 diff --git a/static/fonts/UbuntuNerdFont-Bold.ttf b/static/fonts/UbuntuNerdFont-Bold.ttf new file mode 100644 index 0000000..c9a1dc1 --- /dev/null +++ b/static/fonts/UbuntuNerdFont-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c115316a540b80a645c37320ae5b25f96d3df3a4c9bca5d65d7ee12dd5e8be95 +size 2022868 diff --git a/static/fonts/UbuntuNerdFont-Italic.ttf b/static/fonts/UbuntuNerdFont-Italic.ttf new file mode 100644 index 0000000..8dfdd21 --- /dev/null +++ b/static/fonts/UbuntuNerdFont-Italic.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e35b2393c797814314e400d290fb3d8c34e9dcb237611e6fdc9c2ac9206015 +size 2079364 diff --git a/static/fonts/UbuntuNerdFont-Regular.ttf b/static/fonts/UbuntuNerdFont-Regular.ttf new file mode 100644 index 0000000..dbf8c05 --- /dev/null +++ b/static/fonts/UbuntuNerdFont-Regular.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d31cad77bf8cca796c5f0791f7adb7db5ddcd41e577c9a1bce72489bfe539591 +size 2049360 diff --git a/styles/main.scss b/styles/main.scss index 3746120..83868e4 100644 --- a/styles/main.scss +++ b/styles/main.scss @@ -1,4 +1,5 @@ // The foundation +@import "styles/fonts"; @import "styles/normalize"; @import "styles/variables"; @import "styles/color-palette";