Get google font from google fonts

and add petaluma text font part to the project.
0xfe · Jul 13, 2020 · a6c4871 · a6c4871
1 parent 4f0b422
commit a6c4871
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/releases/fonts/petalumascript-webfont.woff b/releases/fonts/petalumascript-webfont.woff
diff --git a/releases/fonts/petalumascript-webfont.woff2 b/releases/fonts/petalumascript-webfont.woff2
diff --git a/src/chordsymbol.js b/src/chordsymbol.js
@@ -374,7 +374,7 @@ export class ChordSymbol extends Modifier {
     if (this.musicFont.name === 'Petaluma') {
       fontFamily = 'petalumaScript,Arial';
     } else {
-      fontFamily = 'robotoSlab,Times';
+      fontFamily = 'Roboto Slab,Times';
     }
     this.font = {
       family: fontFamily,

diff --git a/tests/flow.css b/tests/flow.css
@@ -1,20 +1,17 @@
 
+/* petaluma text font not available from webfont cdn that I know of, so get it
+  fron the project
+  */
 @font-face {
     font-family: 'petalumaScript';
-    src: url('https://aarondavidnewman.github.io/Smoosic/build/styles/fonts/petalumascript-webfont.woff2') format('woff2'),
-         url('https://aarondavidnewman.github.io/Smoosic/build/styles/fonts/petalumascript-webfont.woff') format('woff');
+    src: url('../releases/fonts/petalumascript-webfont.woff2') format('woff2'),
+         url('../releases/fonts/petalumascript-webfont.woff') format('woff');
     font-weight: normal;
     font-style: normal;
 }
-
 @font-face {
-    font-family: 'robotoSlab';
-    src: url('https://aarondavidnewman.github.io/Smoosic/build/styles/fonts/robotoslab-webfont.woff2') format('woff2'),
-         url('https://aarondavidnewman.github.io/Smoosic/build/styles/fonts/robotoslab-webfont.woff') format('woff');
-    font-weight: 500;
-    font-style: normal;
+    font-family: 'Roboto Slab', serif;
 }
-
 body {
   padding: 20px;
   font-family: Arial, sans-serif;

diff --git a/tests/flow.html b/tests/flow.html
@@ -9,6 +9,7 @@
 
   <!-- Test Dependencies: jQuery, QUnit -->
   <link rel="stylesheet" href="support/qunit.css" type="text/css" media="screen" />
+<link href="https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@500&display=swap" rel="stylesheet">
   <script src="support/jquery.js"></script>
   <script src="support/qunit.js"></script>