notes: add multiple new fonts (#4212).

Add the following fonts: * Comic (Comic Relief) * Slab Sans (Anton) * Slab Serif (Rokkitt) * Formal Serif (Lora) * Formal Cursive (Petit Formal Script) * Print (Kalam) * Hand (Indie Flower) * Narrow (Archivo Narrow) * Blackletter (Unifraktur Maguntia) Add the following font aliases: * Comic Sans MS is aliased to Comic Relief. * Arial Narrow is aliased to Archivo Narrow. * Rockwell is aliased to Rokkitt. * Impact is aliased to Anton.
2019-11-25 15:06:59 -06:00
parent 761cbc47c1
commit b43008a506
3 changed files with 293 additions and 3 deletions
--- a/app/javascript/src/styles/common/fonts.css
+++ b/app/javascript/src/styles/common/fonts.css
@@ -1,4 +1,4 @@
-/* These are fallback fonts intended for use in notes. */
+/* These are fonts intended for use in notes. */

 /* https://fontlibrary.org/en/font/comic-relief */
@font-face {
@@ -6,7 +6,7 @@
  font-weight: normal;
  font-display: swap;
  src:
-    local("Comic Sans MS"),
+    local("Comic Relief"),
    url("../../../../../node_modules/typopro-web/web/TypoPRO-ComicRelief/TypoPRO-ComicRelief-Regular.woff") format("woff");
 }

@@ -15,6 +15,254 @@
  font-weight: bold;
  font-display: swap;
  src:
-    local("Comic Sans MS"),
+    local("Comic Relief"),
    url("../../../../../node_modules/typopro-web/web/TypoPRO-ComicRelief/TypoPRO-ComicRelief-Bold.woff") format("woff");
 }
+
+@font-face {
+  font-family: "Comic";
+  font-weight: normal;
+  font-display: swap;
+  src:
+    local("Comic Relief"),
+    url("../../../../../node_modules/typopro-web/web/TypoPRO-ComicRelief/TypoPRO-ComicRelief-Regular.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Comic";
+  font-weight: bold;
+  font-display: swap;
+  src:
+    local("Comic Relief"),
+    url("../../../../../node_modules/typopro-web/web/TypoPRO-ComicRelief/TypoPRO-ComicRelief-Bold.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Rokkitt */
+@font-face {
+  font-family: "Rockwell";
+  font-weight: 400;
+  font-display: swap;
+  src:
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Rockwell";
+  font-weight: 700;
+  font-display: swap;
+  src:
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-700.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-700.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Slab Serif";
+  font-weight: 400;
+  font-display: swap;
+  src:
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Slab Serif";
+  font-weight: 700;
+  font-display: swap;
+  src:
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-700.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-rokkitt/files/rokkitt-latin-700.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Anton */
+@font-face {
+  font-family: "Impact";
+  font-display: swap;
+  src:
+    local("Anton"),
+    url("../../../../../node_modules/typeface-anton/files/anton-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-anton/files/anton-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Slab Sans";
+  font-display: swap;
+  src:
+    local("Anton"),
+    url("../../../../../node_modules/typeface-anton/files/anton-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-anton/files/anton-latin-400.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Archivo+Narrow */
+@font-face {
+  font-family: "Arial Narrow";
+  font-weight: 400;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Arial Narrow";
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400italic.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Arial Narrow";
+  font-weight: 700;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Arial Narrow";
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700italic.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Narrow";
+  font-weight: 400;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Narrow";
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-400italic.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Narrow";
+  font-weight: 700;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Narrow";
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Archivo Narrow"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-archivo-narrow/files/archivo-narrow-latin-700italic.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Lora */
+@font-face {
+  font-family: "Formal Serif";
+  font-display: swap;
+  src:
+    local("Lora"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-400.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Formal Serif";
+  font-weight: bold;
+  font-display: swap;
+  src:
+    local("Lora"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-700.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-700.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Formal Serif";
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Lora"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-400italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-400italic.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Formal Serif";
+  font-weight: bold;
+  font-style: italic;
+  font-display: swap;
+  src:
+    local("Lora"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-700italic.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-lora/files/lora-latin-700italic.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Lora */
+@font-face {
+  font-family: "Print";
+  font-display: swap;
+  src:
+    local("Kalam"),
+    url("../../../../../node_modules/typopro-web/web/TypoPRO-Kalam/TypoPRO-Kalam-Regular.woff") format("woff");
+}
+
+@font-face {
+  font-family: "Print";
+  font-weight: bold;
+  font-display: swap;
+  src:
+    local("Kalam"),
+    url("../../../../../node_modules/typopro-web/web/TypoPRO-Kalam/TypoPRO-Kalam-Bold.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Indie+Flower */
+@font-face {
+  font-family: "Hand";
+  font-display: swap;
+  src:
+    local("Indie Flower"),
+    url("../../../../../node_modules/typeface-indie-flower/files/indie-flower-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-indie-flower/files/indie-flower-latin-400.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/Petit+Formal+Script */
+@font-face {
+  font-family: "Formal Cursive";
+  font-display: swap;
+  src:
+    local("Petit Formal Script"),
+    url("../../../../../node_modules/typeface-petit-formal-script/files/petit-formal-script-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-petit-formal-script/files/petit-formal-script-latin-400.woff") format("woff");
+}
+
+/* https://fonts.google.com/specimen/UnifrakturMaguntia */
+@font-face {
+  font-family: "Blackletter";
+  font-display: swap;
+  src:
+    local("UnifrakturMaguntia"),
+    url("../../../../../node_modules/typeface-unifrakturmaguntia/files/unifrakturmaguntia-latin-400.woff2") format("woff2"),
+    url("../../../../../node_modules/typeface-unifrakturmaguntia/files/unifrakturmaguntia-latin-400.woff") format("woff");
+}
--- a/package.json
+++ b/package.json
@@ -15,6 +15,13 @@
    "script-loader": "^0.7.2",
    "spark-md5": "^3.0.0",
    "stupid-table-plugin": "^1.1.3",
+    "typeface-anton": "^0.0.72",
+    "typeface-archivo-narrow": "^0.0.72",
+    "typeface-indie-flower": "^0.0.72",
+    "typeface-lora": "^0.0.72",
+    "typeface-petit-formal-script": "^0.0.72",
+    "typeface-rokkitt": "^0.0.72",
+    "typeface-unifrakturmaguntia": "^0.0.72",
    "typopro-web": "^4.2.2",
    "webpack-cli": "^3.3.0"
  },
--- a/yarn.lock
+++ b/yarn.lock
@@ -8410,6 +8410,41 @@ typedarray@^0.0.6:
  version "0.0.6"
  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

+typeface-anton@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-anton/-/typeface-anton-0.0.72.tgz#f30d21979fd90e13ef50630027f09575b57cadb4"
+  integrity sha512-erWLoPnR9O0Y1UtvTW8eUIPfihmQBR6MLPyhvkqaOvK7VjOyS2ofJxbriRnjX1OjtvPtYh5lH6bnPFddrkP1OA==
+
+typeface-archivo-narrow@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-archivo-narrow/-/typeface-archivo-narrow-0.0.72.tgz#3515626191b3fa80872d0672c7c20d281ab8e521"
+  integrity sha512-BHA/EgBhQTLAO1gCGYc4hNyCSxXqCEzLARtXblm/uF3eTfKWuu5IgVwC8VReWt1AABySVulH0XCrIa4T4A7N1A==
+
+typeface-indie-flower@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-indie-flower/-/typeface-indie-flower-0.0.72.tgz#80b18841d9c789b262e6f7ff6950a4472e565f60"
+  integrity sha512-BwdRkMP4icqG9nSPQ/k1fyEEs06V0/97yJKrOBrGu77Ge6tGCtqvBV+2ke9ASMGxKOUyufZoPZ0zscE3ZxvSvw==
+
+typeface-lora@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-lora/-/typeface-lora-0.0.72.tgz#850c211ef51167d8b71b610c93a9b1ca0f17863c"
+  integrity sha512-6Q029hpZAJOU2K0V3JM0xColUa/u/0xpzgN5nv1aKe019lNYp9u+6u+BF3zK7n+gwGAjrz75qdFxhM34fheSAA==
+
+typeface-petit-formal-script@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-petit-formal-script/-/typeface-petit-formal-script-0.0.72.tgz#aa9361a5a919ca8403dca24dc115770b17ed0fd3"
+  integrity sha512-1gxpzetKTvVZvbvpYMPpd110VHi3gbwVvTBa+YydyFnv4iVgSBGwvYrnz6QlNQ/u08+N32CFvaSAVFjtb6CLlw==
+
+typeface-rokkitt@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-rokkitt/-/typeface-rokkitt-0.0.72.tgz#4391f2f9f277e6a175766041ead3d0ff097863dd"
+  integrity sha512-x2nX6CHmfWqU5RSQ/oSHt+h0xtwGwTf0vtgOuhcexNgh1+k0pG3f9epW7bOUybghezXKJqVNO64KYua5g95URQ==
+
+typeface-unifrakturmaguntia@^0.0.72:
+  version "0.0.72"
+  resolved "https://registry.yarnpkg.com/typeface-unifrakturmaguntia/-/typeface-unifrakturmaguntia-0.0.72.tgz#2c314a0ebf54d522c9ceb84fa338bbf3b698b6d4"
+  integrity sha512-+arjO+M5PK9CEMtJm7KWCxZS4NIhxHx04iBuTKiU95JyB9xD4YBpfU5Y3NYqUPvUj3YnNJbPvq9B9Ayt0JE8ug==
+
 typopro-web@^4.2.2:
  version "4.2.2"
  resolved "https://registry.yarnpkg.com/typopro-web/-/typopro-web-4.2.2.tgz#31cc5823ae80e7afe899fc98e2e2054508f840e9"