summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/COPYING_font_Inter (renamed from web/COPYING_inter)0
-rw-r--r--web/COPYING_font_Lato93
-rw-r--r--web/COPYING_font_SourceSerif493
-rw-r--r--web/COPYING_font_bootstrap-icons (renamed from web/COPYING_bootstrap-icons)0
-rw-r--r--web/static/fonts/Inter-num.woff2 (renamed from web/static/fonts/inter-num.woff2)bin2244 -> 2244 bytes
-rw-r--r--web/static/fonts/Lato-Bold.woff2bin0 -> 27804 bytes
-rw-r--r--web/static/fonts/Lato-Regular.woff2bin0 -> 28456 bytes
-rw-r--r--web/static/fonts/SourceSerif4-Bold.ttf.woff2bin0 -> 81320 bytes
-rw-r--r--web/static/fonts/SourceSerif4-It.ttf.woff2bin0 -> 59860 bytes
-rw-r--r--web/static/fonts/SourceSerif4-Regular.ttf.woff2bin0 -> 76180 bytes
-rw-r--r--web/static/style.css46
-rw-r--r--web/static/sw.js11
12 files changed, 235 insertions, 8 deletions
diff --git a/web/COPYING_inter b/web/COPYING_font_Inter
index ff80f8c..ff80f8c 100644
--- a/web/COPYING_inter
+++ b/web/COPYING_font_Inter
diff --git a/web/COPYING_font_Lato b/web/COPYING_font_Lato
new file mode 100644
index 0000000..dfca0da
--- /dev/null
+++ b/web/COPYING_font_Lato
@@ -0,0 +1,93 @@
+Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
+
+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:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+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/web/COPYING_font_SourceSerif4 b/web/COPYING_font_SourceSerif4
new file mode 100644
index 0000000..78bb291
--- /dev/null
+++ b/web/COPYING_font_SourceSerif4
@@ -0,0 +1,93 @@
+Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
+
+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: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+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/web/COPYING_bootstrap-icons b/web/COPYING_font_bootstrap-icons
index 47f06b6..47f06b6 100644
--- a/web/COPYING_bootstrap-icons
+++ b/web/COPYING_font_bootstrap-icons
diff --git a/web/static/fonts/inter-num.woff2 b/web/static/fonts/Inter-num.woff2
index 5cea7a5..5cea7a5 100644
--- a/web/static/fonts/inter-num.woff2
+++ b/web/static/fonts/Inter-num.woff2
Binary files differ
diff --git a/web/static/fonts/Lato-Bold.woff2 b/web/static/fonts/Lato-Bold.woff2
new file mode 100644
index 0000000..2cc580d
--- /dev/null
+++ b/web/static/fonts/Lato-Bold.woff2
Binary files differ
diff --git a/web/static/fonts/Lato-Regular.woff2 b/web/static/fonts/Lato-Regular.woff2
new file mode 100644
index 0000000..c9c4a67
--- /dev/null
+++ b/web/static/fonts/Lato-Regular.woff2
Binary files 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
--- /dev/null
+++ b/web/static/fonts/SourceSerif4-Bold.ttf.woff2
Binary files 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
--- /dev/null
+++ b/web/static/fonts/SourceSerif4-It.ttf.woff2
Binary files 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
--- /dev/null
+++ b/web/static/fonts/SourceSerif4-Regular.ttf.woff2
Binary files 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) {