Put all web fonts into same CSS file.

Use bolder Circled Number font.

9 files changed, 16 insertions, 25 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 3771e27..e83cb31 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -4,7 +4,7 @@ All data is stored in an SQLite3 database.
 
 The server and game rules are implemented in Javascript.
 The game state is stored in the database as a JSON blob.
-The server runs on Node with the Express.js and Socket.io frameworks.
+The server runs on Node with the Express.js framework.
 
 Check out the game submodules:
 
diff --git a/public/fonts/CircledNumbers.woff2 b/public/fonts/CircledNumbers.woff2
index 93ff257..0d165ff 100644
--- a/public/fonts/CircledNumbers.woff2
+++ b/public/fonts/CircledNumbers.woff2
diff --git a/public/fonts/gentium-basic-v12-latin-700.woff2 b/public/fonts/GentiumBasic-Bold.woff2
index 2f6c6d8..2f6c6d8 100644
--- a/public/fonts/gentium-basic-v12-latin-700.woff2
+++ b/public/fonts/GentiumBasic-Bold.woff2
diff --git a/public/fonts/gentium-basic-v12-latin-700italic.woff2 b/public/fonts/GentiumBasic-BoldItalic.woff2
index fc5ea18..fc5ea18 100644
--- a/public/fonts/gentium-basic-v12-latin-700italic.woff2
+++ b/public/fonts/GentiumBasic-BoldItalic.woff2
diff --git a/public/fonts/gentium-basic-v12-latin-italic.woff2 b/public/fonts/GentiumBasic-Italic.woff2
index 2687205..2687205 100644
--- a/public/fonts/gentium-basic-v12-latin-italic.woff2
+++ b/public/fonts/GentiumBasic-Italic.woff2
diff --git a/public/fonts/gentium-basic-v12-latin-regular.woff2 b/public/fonts/GentiumBasic-Regular.woff2
index dffee0a..dffee0a 100644
--- a/public/fonts/gentium-basic-v12-latin-regular.woff2
+++ b/public/fonts/GentiumBasic-Regular.woff2
diff --git a/public/fonts/README b/public/fonts/README
index 726658e..c73d3f6 100644
--- a/public/fonts/README
+++ b/public/fonts/README
@@ -12,3 +12,10 @@ Source Sans 3 is from Adobe under the SIL Open Font License.
 
 Source Serif 4 is from Adobe under the SIL Open Font License.
 	https://github.com/adobe-fonts/source-serif
+
+Gentium Basic is from SIL International under the SIL Open Font License.
+	https://software.sil.org/gentium/download/
+
+Dinish is from playbeing under the SIL Open Font License.
+	https://fonts.playbeing.com/
+	https://github.com/playbeing/dinish
diff --git a/public/fonts/fonts.css b/public/fonts/fonts.css
index 2dfe776..5d47424 100644
--- a/public/fonts/fonts.css
+++ b/public/fonts/fonts.css
@@ -1,15 +1,23 @@
 @font-face{font-family:'Circled Numbers';src:url('/fonts/CircledNumbers.woff2')format('woff2');unicode-range:U+2460-2465, U+2776-277B}
 @font-face{font-family:'Dingbats';src:url('/fonts/Dingbats.woff2')format('woff2');unicode-range:U+2701-27FF}
 @font-face{font-family:'Noto Emoji';src:url('/fonts/NotoEmoji.woff2')format('woff2')}
+
 @font-face{font-family:'Source Sans';src:url('/fonts/SourceSans3-Regular.woff2')format('woff2')}
 @font-face{font-family:'Source Sans';font-style:italic;src:url('/fonts/SourceSans3-It.woff2')format('woff2')}
 @font-face{font-family:'Source Sans';font-weight:bold;src:url('/fonts/SourceSans3-Semibold.woff2')format('woff2')}
 @font-face{font-family:'Source Sans';font-weight:bold;font-style:italic;src:url('/fonts/SourceSans3-SemiboldIt.woff2')format('woff2')}
+
 @font-face{font-family:'Source Serif';src:url('/fonts/SourceSerif4-Regular.woff2')format('woff2')}
 @font-face{font-family:'Source Serif';font-style:italic;src:url('/fonts/SourceSerif4-It.woff2')format('woff2')}
 @font-face{font-family:'Source Serif';font-weight:bold;src:url('/fonts/SourceSerif4-Semibold.woff2')format('woff2')}
 @font-face{font-family:'Source Serif';font-weight:bold;font-style:italic;src:url('/fonts/SourceSerif4-SemiboldIt.woff2')format('woff2')}
+
 @font-face{font-family:'Source Serif SmText';src:url('/fonts/SourceSerif4SmText-Regular.woff2')format('woff2')}
 @font-face{font-family:'Source Serif SmText';font-style:italic;src:url('/fonts/SourceSerif4SmText-It.woff2')format('woff2')}
 @font-face{font-family:'Source Serif SmText';font-weight:bold;src:url('/fonts/SourceSerif4SmText-Semibold.woff2')format('woff2')}
 @font-face{font-family:'Source Serif SmText';font-weight:bold;font-style:italic;src:url('/fonts/SourceSerif4SmText-SemiboldIt.woff2')format('woff2')}
+
+@font-face{font-family:'Gentium Basic';src:url('GentiumBasic-Regular.woff2')format('woff2')}
+@font-face{font-family:'Gentium Basic';font-style:italic;src:url('GentiumBasic-Italic.woff2')format('woff2')}
+@font-face{font-family:'Gentium Basic';font-weight:bold;src:url('GentiumBasic-Bold.woff2')format('woff2')}
+@font-face{font-family:'Gentium Basic';font-weight:bold;font-style:italic;src:url('GentiumBasic-BoldItalic.woff2')format('woff2')}
diff --git a/public/fonts/gentium.css b/public/fonts/gentium.css
deleted file mode 100644
index b85caa3..0000000
--- a/public/fonts/gentium.css
+++ /dev/null
@@ -1,24 +0,0 @@
-@font-face {
-	font-family: 'Gentium Basic';
-	font-style: normal;
-	font-weight: 400;
-	src: url('gentium-basic-v12-latin-regular.woff2') format('woff2');
-}
-@font-face {
-	font-family: 'Gentium Basic';
-	font-style: italic;
-	font-weight: 400;
-	src: url('gentium-basic-v12-latin-italic.woff2') format('woff2');
-}
-@font-face {
-	font-family: 'Gentium Basic';
-	font-style: normal;
-	font-weight: bold;
-	src: url('gentium-basic-v12-latin-700.woff2') format('woff2');
-}
-@font-face {
-	font-family: 'Gentium Basic';
-	font-style: italic;
-	font-weight: bold;
-	src: url('gentium-basic-v12-latin-700italic.woff2') format('woff2');
-}