From 44519eb0c9d1c4bc5295708bd8feeb174c04825a Mon Sep 17 00:00:00 2001 From: David Vazgenovich Shakaryan Date: Fri, 13 May 2022 21:24:18 -0700 Subject: web: host fonts locally --- web/static/fonts/Inter-num.woff2 | Bin 0 -> 2244 bytes web/static/fonts/Lato-Bold.woff2 | Bin 0 -> 27804 bytes web/static/fonts/Lato-Regular.woff2 | Bin 0 -> 28456 bytes web/static/fonts/SourceSerif4-Bold.ttf.woff2 | Bin 0 -> 81320 bytes web/static/fonts/SourceSerif4-It.ttf.woff2 | Bin 0 -> 59860 bytes web/static/fonts/SourceSerif4-Regular.ttf.woff2 | Bin 0 -> 76180 bytes web/static/fonts/inter-num.woff2 | Bin 2244 -> 0 bytes web/static/style.css | 46 +++++++++++++++++++++--- web/static/sw.js | 11 ++++-- 9 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 web/static/fonts/Inter-num.woff2 create mode 100644 web/static/fonts/Lato-Bold.woff2 create mode 100644 web/static/fonts/Lato-Regular.woff2 create mode 100644 web/static/fonts/SourceSerif4-Bold.ttf.woff2 create mode 100644 web/static/fonts/SourceSerif4-It.ttf.woff2 create mode 100644 web/static/fonts/SourceSerif4-Regular.ttf.woff2 delete mode 100644 web/static/fonts/inter-num.woff2 (limited to 'web/static') diff --git a/web/static/fonts/Inter-num.woff2 b/web/static/fonts/Inter-num.woff2 new file mode 100644 index 0000000..5cea7a5 Binary files /dev/null and b/web/static/fonts/Inter-num.woff2 differ diff --git a/web/static/fonts/Lato-Bold.woff2 b/web/static/fonts/Lato-Bold.woff2 new file mode 100644 index 0000000..2cc580d Binary files /dev/null and b/web/static/fonts/Lato-Bold.woff2 differ diff --git a/web/static/fonts/Lato-Regular.woff2 b/web/static/fonts/Lato-Regular.woff2 new file mode 100644 index 0000000..c9c4a67 Binary files /dev/null and b/web/static/fonts/Lato-Regular.woff2 differ diff --git a/web/static/fonts/SourceSerif4-Bold.ttf.woff2 b/web/static/fonts/SourceSerif4-Bold.ttf.woff2 new file mode 100644 index 0000000..db57d21 Binary files /dev/null and b/web/static/fonts/SourceSerif4-Bold.ttf.woff2 differ diff --git a/web/static/fonts/SourceSerif4-It.ttf.woff2 b/web/static/fonts/SourceSerif4-It.ttf.woff2 new file mode 100644 index 0000000..1cbc021 Binary files /dev/null and b/web/static/fonts/SourceSerif4-It.ttf.woff2 differ diff --git a/web/static/fonts/SourceSerif4-Regular.ttf.woff2 b/web/static/fonts/SourceSerif4-Regular.ttf.woff2 new file mode 100644 index 0000000..2db73fe Binary files /dev/null and b/web/static/fonts/SourceSerif4-Regular.ttf.woff2 differ diff --git a/web/static/fonts/inter-num.woff2 b/web/static/fonts/inter-num.woff2 deleted file mode 100644 index 5cea7a5..0000000 Binary files a/web/static/fonts/inter-num.woff2 and /dev/null differ diff --git a/web/static/style.css b/web/static/style.css index 0d2fbcd..852cffd 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -1,4 +1,40 @@ -@import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700&family=Source+Serif+Pro:ital,wght@0,400;0,700;1,400&display=swap'); +@font-face { + font-family: 'Lato'; + font-weight: 400; + font-display: swap; + src: url('fonts/Lato-Regular.woff2') format('woff2'); +} + +@font-face { + font-family: 'Lato'; + font-weight: 700; + font-display: swap; + src: url('fonts/Lato-Bold.woff2') format('woff2'); +} + +@font-face { + font-family: 'Source Serif 4'; + font-weight: 400; + font-style: normal; + font-display: swap; + src: url('fonts/SourceSerif4-Regular.ttf.woff2') format('woff2'); +} + +@font-face { + font-family: 'Source Serif 4'; + font-weight: 400; + font-style: italic; + font-display: swap; + src: url('fonts/SourceSerif4-It.ttf.woff2') format('woff2'); +} + +@font-face { + font-family: 'Source Serif 4'; + font-weight: 700; + font-style: normal; + font-display: swap; + src: url('fonts/SourceSerif4-Bold.ttf.woff2') format('woff2'); +} @font-face { font-family: 'bootstrap-icons-sub'; @@ -6,8 +42,8 @@ } @font-face { - font-family: 'inter-num'; - src: url('fonts/inter-num.woff2') format('woff2'); + font-family: 'Inter-num'; + src: url('fonts/Inter-num.woff2') format('woff2'); } html { @@ -270,7 +306,7 @@ body { } #controls #keypad-dartboard #dartboard { - font-family: 'inter-num'; + font-family: 'Inter-num'; height: 100%; filter: drop-shadow(0 0 0.4rem #111); @@ -512,7 +548,7 @@ body { .modal-content { background-color: #222; font-size: 1.4em; - font-family: 'Source Serif Pro', serif; + font-family: 'Source Serif 4', serif; user-select: text; width: calc(min(44em, 100%) - 8em); diff --git a/web/static/sw.js b/web/static/sw.js index 6359ae5..bf1d818 100644 --- a/web/static/sw.js +++ b/web/static/sw.js @@ -1,5 +1,5 @@ const CACHE_PREFIX = 'dartboat-' -const CACHE_VERSION = '4'; +const CACHE_VERSION = '5'; const CACHE_NAME = `${CACHE_PREFIX}${CACHE_VERSION}`; const CACHE_FILES = [ @@ -8,8 +8,13 @@ const CACHE_FILES = [ 'dartboat.js', 'dartboat_wasm.js', 'dartboat_wasm.wasm', - 'fonts/bootstrap-icons-sub.woff2', - 'fonts/inter-num.woff2' + 'fonts/Lato-Regular.woff2', + 'fonts/Lato-Bold.woff2', + 'fonts/SourceSerif4-Regular.ttf.woff2', + 'fonts/SourceSerif4-It.ttf.woff2', + 'fonts/SourceSerif4-Bold.ttf.woff2', + 'fonts/Inter-num.woff2', + 'fonts/bootstrap-icons-sub.woff2' ] function swlog(str) { -- cgit v1.2.3-70-g09d2