diff --git a/src/components/scripts.lisp b/src/components/scripts.lisp
index e5b6e49..41b9a78 100644
--- a/src/components/scripts.lisp
+++ b/src/components/scripts.lisp
@@ -4,9 +4,6 @@
(:export #:~scripts))
(in-package #:website/components/scripts)
-(defparameter *google-font-url*
- "https://fonts.googleapis.com/css2?family=Zen+Maru+Gothic:wght@400;700&display=swap")
-
(defun bust-cache (url)
(format nil "~a?v=~a" url #.(get-universal-time)))
@@ -14,15 +11,6 @@
(hsx
(<>
(link :rel "stylesheet" :href (bust-cache "/style/dist.css"))
- (link :rel "preconnect" :href "https://fonts.gstatic.com" :crossorigin t)
- (link :rel "preconnect" :href "https://fonts.googleapis.com")
- (link
- :rel "preload"
- :href *google-font-url*
- :as "style"
- :onload "this.onload=null;this.rel='stylesheet'")
- (noscript
- (link :rel "stylesheet" :href *google-font-url*))
(script :src "https://cdn.jsdelivr.net/npm/htmx.org@2.0.4/dist/htmx.min.js")
(script :src "https://cdn.jsdelivr.net/npm/htmx-ext-preload@2.1.1/dist/preload.min.js")
(script :src "https://cdn.jsdelivr.net/npm/htmx-ext-head-support@2.0.4/dist/head-support.min.js")
diff --git a/static/style/OFL.txt b/static/style/OFL.txt
new file mode 100755
index 0000000..975822a
--- /dev/null
+++ b/static/style/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2021 The Zen Maru Gothic Project Authors (https://github.com/googlefonts/zen-marugothic)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/static/style/ZenMaruGothic-Bold.woff b/static/style/ZenMaruGothic-Bold.woff
new file mode 100644
index 0000000..1c036a2
Binary files /dev/null and b/static/style/ZenMaruGothic-Bold.woff differ
diff --git a/static/style/ZenMaruGothic-Regular.woff b/static/style/ZenMaruGothic-Regular.woff
new file mode 100644
index 0000000..efc35ba
Binary files /dev/null and b/static/style/ZenMaruGothic-Regular.woff differ
diff --git a/static/style/global.css b/static/style/global.css
index 62d5873..b5affca 100644
--- a/static/style/global.css
+++ b/static/style/global.css
@@ -1,8 +1,22 @@
@import "tailwindcss";
@plugin "@tailwindcss/typography";
+@font-face {
+ font-family: 'ZenMaruGothic';
+ src: url('./ZenMaruGothic-Regular.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'ZenMaruGothic';
+ src: url('./ZenMaruGothic-Bold.woff') format('woff');
+ font-weight: bold;
+ font-style: normal;
+}
+
:root {
- font-family: "Zen Maru Gothic", sans-serif;
+ font-family: "ZenMaruGothic", sans-serif;
}
@view-transition {