Merge branch 'feature/update-fonts' into feature/update

SnowdogApps · Aug 13, 2021 · 82c18b2 · 82c18b2
2 parents 56ba307 + 8115c23
commit 82c18b2
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 4 deletions.
diff --git a/assets/fonts/FrankRuhlLibre-Bold.ttf b/assets/fonts/FrankRuhlLibre-Bold.ttf
diff --git a/assets/fonts/FrankRuhlLibre-Bold.woff b/assets/fonts/FrankRuhlLibre-Bold.woff
diff --git a/assets/fonts/FrankRuhlLibre-Bold.woff2 b/assets/fonts/FrankRuhlLibre-Bold.woff2
diff --git a/assets/fonts/PublicSans-Bold.ttf b/assets/fonts/PublicSans-Bold.ttf
diff --git a/assets/fonts/PublicSans-Bold.woff b/assets/fonts/PublicSans-Bold.woff
diff --git a/assets/fonts/PublicSans-Bold.woff2 b/assets/fonts/PublicSans-Bold.woff2
diff --git a/assets/fonts/PublicSans-Regular.ttf b/assets/fonts/PublicSans-Regular.ttf
diff --git a/assets/fonts/PublicSans-Regular.woff b/assets/fonts/PublicSans-Regular.woff
diff --git a/assets/fonts/PublicSans-Regular.woff2 b/assets/fonts/PublicSans-Regular.woff2
diff --git a/assets/styles/_fonts.css b/assets/styles/_fonts.css
@@ -0,0 +1,23 @@
+@font-face {
+  font-weight: 700;
+  font-family: 'Frank Ruhl Libre';
+  font-style: normal;
+  src: url(/assets/fonts/FrankRuhlLibre-Bold.woff2) format('woff2'), url(/assets/fonts/FrankRuhlLibre-Bold.woff) format('woff'), url(/assets/fonts/FrankRuhlLibre-Bold.ttf) format('ttf');
+  font-display: swap;
+}
+
+@font-face {
+  font-weight: 400;
+  font-family: 'Public Sans';
+  font-style: normal;
+  src: url(/assets/fonts/PublicSans-Regular.woff2) format('woff2'), url(/assets/fonts/PublicSans-Regular.woff) format('woff'), url(/assets/fonts/PublicSans-Regular.ttf) format('ttf');
+  font-display: swap;
+}
+
+@font-face {
+  font-weight: 700;
+  font-family: 'Public Sans';
+  font-style: normal;
+  src: url(/assets/fonts/PublicSans-Bold.woff2) format('woff2'), url(/assets/fonts/PublicSans-Bold.woff) format('woff'), url(/assets/fonts/PublicSans-Bold.ttf) format('ttf');
+  font-display: swap;
+}
diff --git a/assets/styles/tailwind.css b/assets/styles/tailwind.css
@@ -1,5 +1,4 @@
-/* Not the prettiest way, but I need it to work now */
-@import url('https://fonts.googleapis.com/css2?family=Playfair+Display&family=Work+Sans:wght@400;500;700&display=swap');
+@import './_fonts.css';
 
 @tailwind base;
 @tailwind components;

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -61,8 +61,8 @@ module.exports = {
       xxl: '1600px'
     },
     fontFamily: {
-      serif: ['Playfair Display', 'serif'],
-      sans: ['Work Sans', 'sans-serif'],
+      serif: ['Frank Ruhl Libre', 'serif'],
+      sans: ['Public Sans', 'sans-serif'],
       mono: ['menlo', 'monaco', 'consolas', 'Liberation Mono', 'Courier New', 'monospace']
     },
     backgroundColor: theme => ({