From: Lanius Trolling <lanius@laniustrolling.dev>
Date: Mon, 13 Feb 2023 22:11:56 +0000 (-0500)
Subject: Remove dependency on Google Fonts
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=efb06988eb9a1e90cff3a0d37bd2067582a8e8aa;p=factbooks

Remove dependency on Google Fonts
---

diff --git a/.gitignore b/.gitignore
index a8058ec..fe9a04d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,4 +44,5 @@ bin/
 # Webapp specific
 logs/
 test/
-config.json
\ No newline at end of file
+config.json
+font-src/
diff --git a/src/main/kotlin/info/mechyrdia/lore/parser_tags.kt b/src/main/kotlin/info/mechyrdia/lore/parser_tags.kt
index 4337d4d..a83e8e9 100644
--- a/src/main/kotlin/info/mechyrdia/lore/parser_tags.kt
+++ b/src/main/kotlin/info/mechyrdia/lore/parser_tags.kt
@@ -73,13 +73,13 @@ enum class TextParserFormattingTag(val type: TextParserTagType<Unit>) {
 	),
 	IPA(
 		TextParserTagType.Direct(
-			{ _, _ -> "<span style='font-family: Noto Serif, serif'>" },
+			{ _, _ -> "<span style='font-family: DejaVu Sans'>" },
 			{ "</span>" },
 		)
 	),
 	CODE(
 		TextParserTagType.Direct(
-			{ _, _ -> "<span style='font-family: JetBrains Mono, monospace'><pre>" },
+			{ _, _ -> "<span style='font-family: JetBrains Mono'><pre>" },
 			{ "</pre></span>" },
 		)
 	),
diff --git a/src/main/kotlin/info/mechyrdia/lore/view_tpl.kt b/src/main/kotlin/info/mechyrdia/lore/view_tpl.kt
index 33f5f2f..c93af0a 100644
--- a/src/main/kotlin/info/mechyrdia/lore/view_tpl.kt
+++ b/src/main/kotlin/info/mechyrdia/lore/view_tpl.kt
@@ -22,10 +22,6 @@ fun ApplicationCall.page(pageTitle: String, navBar: List<NavItem>? = null, sideb
 			
 			link(rel = "icon", type = "image/svg+xml", href = "/static/images/icon.svg")
 			
-			link(rel = "preconnect", href = "https://fonts.googleapis.com")
-			link(rel = "preconnect", href = "https://fonts.gstatic.com") { attributes["crossorigin"] = "anonymous" }
-			link(rel = "stylesheet", href = "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,400;0,700;1,400;1,700&family=Noto+Sans+Gothic&family=Noto+Serif:ital,wght@0,400;0,700;1,400;1,700&family=JetBrains+Mono:ital,wght@0,500;0,800;1,500;1,800&family=Oxanium:wght@400;600;700;800&display=swap")
-			
 			link(rel = "stylesheet", href = "/static/style.css")
 			
 			title {
diff --git a/src/main/resources/static/font/DejaVuSans-Bold.woff b/src/main/resources/static/font/DejaVuSans-Bold.woff
new file mode 100644
index 0000000..c8782b3
Binary files /dev/null and b/src/main/resources/static/font/DejaVuSans-Bold.woff differ
diff --git a/src/main/resources/static/font/DejaVuSans-BoldOblique.woff b/src/main/resources/static/font/DejaVuSans-BoldOblique.woff
new file mode 100644
index 0000000..cab068f
Binary files /dev/null and b/src/main/resources/static/font/DejaVuSans-BoldOblique.woff differ
diff --git a/src/main/resources/static/font/DejaVuSans-Oblique.woff b/src/main/resources/static/font/DejaVuSans-Oblique.woff
new file mode 100644
index 0000000..7cd5cfd
Binary files /dev/null and b/src/main/resources/static/font/DejaVuSans-Oblique.woff differ
diff --git a/src/main/resources/static/font/DejaVuSans.woff b/src/main/resources/static/font/DejaVuSans.woff
new file mode 100644
index 0000000..9bd1c50
Binary files /dev/null and b/src/main/resources/static/font/DejaVuSans.woff differ
diff --git a/src/main/resources/static/font/JetBrainsMono-ExtraBold.woff b/src/main/resources/static/font/JetBrainsMono-ExtraBold.woff
new file mode 100644
index 0000000..11b8c72
Binary files /dev/null and b/src/main/resources/static/font/JetBrainsMono-ExtraBold.woff differ
diff --git a/src/main/resources/static/font/JetBrainsMono-ExtraBoldItalic.woff b/src/main/resources/static/font/JetBrainsMono-ExtraBoldItalic.woff
new file mode 100644
index 0000000..72e2e9e
Binary files /dev/null and b/src/main/resources/static/font/JetBrainsMono-ExtraBoldItalic.woff differ
diff --git a/src/main/resources/static/font/JetBrainsMono-Medium.woff b/src/main/resources/static/font/JetBrainsMono-Medium.woff
new file mode 100644
index 0000000..aac1a42
Binary files /dev/null and b/src/main/resources/static/font/JetBrainsMono-Medium.woff differ
diff --git a/src/main/resources/static/font/JetBrainsMono-MediumItalic.woff b/src/main/resources/static/font/JetBrainsMono-MediumItalic.woff
new file mode 100644
index 0000000..997758a
Binary files /dev/null and b/src/main/resources/static/font/JetBrainsMono-MediumItalic.woff differ
diff --git a/src/main/resources/static/font/NotoSans-Black.woff b/src/main/resources/static/font/NotoSans-Black.woff
new file mode 100644
index 0000000..fd4a950
Binary files /dev/null and b/src/main/resources/static/font/NotoSans-Black.woff differ
diff --git a/src/main/resources/static/font/NotoSans-BlackItalic.woff b/src/main/resources/static/font/NotoSans-BlackItalic.woff
new file mode 100644
index 0000000..e3884d7
Binary files /dev/null and b/src/main/resources/static/font/NotoSans-BlackItalic.woff differ
diff --git a/src/main/resources/static/font/NotoSans-Medium.woff b/src/main/resources/static/font/NotoSans-Medium.woff
new file mode 100644
index 0000000..7319e69
Binary files /dev/null and b/src/main/resources/static/font/NotoSans-Medium.woff differ
diff --git a/src/main/resources/static/font/NotoSans-MediumItalic.woff b/src/main/resources/static/font/NotoSans-MediumItalic.woff
new file mode 100644
index 0000000..12ce7cc
Binary files /dev/null and b/src/main/resources/static/font/NotoSans-MediumItalic.woff differ
diff --git a/src/main/resources/static/font/NotoSansGothic-Regular.woff b/src/main/resources/static/font/NotoSansGothic-Regular.woff
new file mode 100644
index 0000000..b042098
Binary files /dev/null and b/src/main/resources/static/font/NotoSansGothic-Regular.woff differ
diff --git a/src/main/resources/static/font/Oxanium-Bold.woff b/src/main/resources/static/font/Oxanium-Bold.woff
new file mode 100644
index 0000000..49f75f1
Binary files /dev/null and b/src/main/resources/static/font/Oxanium-Bold.woff differ
diff --git a/src/main/resources/static/font/Oxanium-ExtraBold.woff b/src/main/resources/static/font/Oxanium-ExtraBold.woff
new file mode 100644
index 0000000..c7ff06f
Binary files /dev/null and b/src/main/resources/static/font/Oxanium-ExtraBold.woff differ
diff --git a/src/main/resources/static/font/Oxanium-Regular.woff b/src/main/resources/static/font/Oxanium-Regular.woff
new file mode 100644
index 0000000..028c619
Binary files /dev/null and b/src/main/resources/static/font/Oxanium-Regular.woff differ
diff --git a/src/main/resources/static/font/Oxanium-SemiBold.woff b/src/main/resources/static/font/Oxanium-SemiBold.woff
new file mode 100644
index 0000000..cb8be50
Binary files /dev/null and b/src/main/resources/static/font/Oxanium-SemiBold.woff differ
diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css
index a32e308..f18d467 100644
--- a/src/main/resources/static/style.css
+++ b/src/main/resources/static/style.css
@@ -1,3 +1,137 @@
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/NotoSans-Medium.woff");
+}
+
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/NotoSans-MediumItalic.woff");
+}
+
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/NotoSans-Black.woff");
+}
+
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/NotoSans-BlackItalic.woff");
+}
+
+@font-face {
+	font-family: 'Noto Sans Gothic';
+	font-display: block;
+	src: url("/static/font/NotoSansGothic-Regular.woff");
+}
+
+@font-face {
+	font-family: 'JetBrains Mono';
+	font-style: normal;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/JetBrainsMono-Medium.woff");
+}
+
+@font-face {
+	font-family: 'JetBrains Mono';
+	font-style: italic;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/JetBrainsMono-MediumItalic.woff");
+}
+
+@font-face {
+	font-family: 'JetBrains Mono';
+	font-style: normal;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/JetBrainsMono-ExtraBold.woff");
+}
+
+@font-face {
+	font-family: 'JetBrains Mono';
+	font-style: italic;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/JetBrainsMono-ExtraBoldItalic.woff");
+}
+
+@font-face {
+	font-family: 'Oxanium';
+	font-style: normal;
+	font-weight: 400;
+	font-display: block;
+	src: url("/static/font/Oxanium-Regular.woff");
+}
+
+@font-face {
+	font-family: 'Oxanium';
+	font-style: normal;
+	font-weight: 600;
+	font-display: block;
+	src: url("/static/font/Oxanium-SemiBold.woff");
+}
+
+@font-face {
+	font-family: 'Oxanium';
+	font-style: normal;
+	font-weight: 700;
+	font-display: block;
+	src: url("/static/font/Oxanium-Bold.woff");
+}
+
+@font-face {
+	font-family: 'Oxanium';
+	font-style: normal;
+	font-weight: 800;
+	font-display: block;
+	src: url("/static/font/Oxanium-ExtraBold.woff");
+}
+
+@font-face {
+	font-family: 'DejaVu Sans';
+	font-style: normal;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/DejaVuSans.woff");
+}
+
+@font-face {
+	font-family: 'DejaVu Sans';
+	font-style: italic;
+	font-weight: normal;
+	font-display: block;
+	src: url("/static/font/DejaVuSans-Oblique.woff");
+}
+
+@font-face {
+	font-family: 'DejaVu Sans';
+	font-style: normal;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/DejaVuSans-Bold.woff");
+}
+
+@font-face {
+	font-family: 'DejaVu Sans';
+	font-style: italic;
+	font-weight: bold;
+	font-display: block;
+	src: url("/static/font/DejaVuSans-BoldOblique.woff");
+}
+
 html {
 	margin: 0;
 	padding: 0;