diff --git a/assets/fonts/FrankRuhlLibre-Bold.ttf b/assets/fonts/FrankRuhlLibre-Bold.ttf new file mode 100644 index 00000000..18262c4f Binary files /dev/null and b/assets/fonts/FrankRuhlLibre-Bold.ttf differ diff --git a/assets/fonts/FrankRuhlLibre-Bold.woff b/assets/fonts/FrankRuhlLibre-Bold.woff new file mode 100644 index 00000000..7791f7f5 Binary files /dev/null and b/assets/fonts/FrankRuhlLibre-Bold.woff differ diff --git a/assets/fonts/FrankRuhlLibre-Bold.woff2 b/assets/fonts/FrankRuhlLibre-Bold.woff2 new file mode 100644 index 00000000..6d765fd5 Binary files /dev/null and b/assets/fonts/FrankRuhlLibre-Bold.woff2 differ diff --git a/assets/fonts/PublicSans-Bold.ttf b/assets/fonts/PublicSans-Bold.ttf new file mode 100644 index 00000000..3eb5ac24 Binary files /dev/null and b/assets/fonts/PublicSans-Bold.ttf differ diff --git a/assets/fonts/PublicSans-Bold.woff b/assets/fonts/PublicSans-Bold.woff new file mode 100644 index 00000000..1a7ac756 Binary files /dev/null and b/assets/fonts/PublicSans-Bold.woff differ diff --git a/assets/fonts/PublicSans-Bold.woff2 b/assets/fonts/PublicSans-Bold.woff2 new file mode 100644 index 00000000..4f2d5801 Binary files /dev/null and b/assets/fonts/PublicSans-Bold.woff2 differ diff --git a/assets/fonts/PublicSans-Regular.ttf b/assets/fonts/PublicSans-Regular.ttf new file mode 100644 index 00000000..25c1646a Binary files /dev/null and b/assets/fonts/PublicSans-Regular.ttf differ diff --git a/assets/fonts/PublicSans-Regular.woff b/assets/fonts/PublicSans-Regular.woff new file mode 100644 index 00000000..3808fbc2 Binary files /dev/null and b/assets/fonts/PublicSans-Regular.woff differ diff --git a/assets/fonts/PublicSans-Regular.woff2 b/assets/fonts/PublicSans-Regular.woff2 new file mode 100644 index 00000000..8835863f Binary files /dev/null and b/assets/fonts/PublicSans-Regular.woff2 differ diff --git a/assets/styles/_fonts.css b/assets/styles/_fonts.css new file mode 100644 index 00000000..3bd7c486 --- /dev/null +++ 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 index fdb85e5a..0e618422 100644 --- 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 index fe678ce8..b1f3451c 100644 --- 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 => ({