Skip to content

web search done right

Use fontsource for loading Montserrat (#40)

Oliver Bøving059d52c54c93
diff --git a/frontend/package.json b/frontend/package.json
index 9c71e487..5a9742f4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -15,6 +15,7 @@
"devDependencies": {
"@astrojs/mdx": "^0.11.1",
"@astrojs/tailwind": "^1.0.0",
+ "@fontsource/montserrat": "^4.5.12",
"@tailwindcss/typography": "^0.5.7",
"prettier": "^2.7.1",
"prettier-plugin-astro": "^0.5.4",
diff --git a/frontend/public/assets/fonts/Montserrat-Black.ttf b/frontend/public/assets/fonts/Montserrat-Black.ttf
deleted file mode 100644
index 7bb6575c..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Black.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Black.woff b/frontend/public/assets/fonts/Montserrat-Black.woff
deleted file mode 100644
index 175f84df..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Black.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-BlackItalic.ttf b/frontend/public/assets/fonts/Montserrat-BlackItalic.ttf
deleted file mode 100644
index 172e2498..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-BlackItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-BlackItalic.woff b/frontend/public/assets/fonts/Montserrat-BlackItalic.woff
deleted file mode 100644
index ca21f04f..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-BlackItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Bold.ttf b/frontend/public/assets/fonts/Montserrat-Bold.ttf
deleted file mode 100644
index efddc834..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Bold.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Bold.woff b/frontend/public/assets/fonts/Montserrat-Bold.woff
deleted file mode 100644
index 9e06e914..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Bold.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-BoldItalic.ttf b/frontend/public/assets/fonts/Montserrat-BoldItalic.ttf
deleted file mode 100644
index b7d8031b..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-BoldItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-BoldItalic.woff b/frontend/public/assets/fonts/Montserrat-BoldItalic.woff
deleted file mode 100644
index 32ee159f..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-BoldItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraBold.ttf b/frontend/public/assets/fonts/Montserrat-ExtraBold.ttf
deleted file mode 100644
index 30595072..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraBold.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraBold.woff b/frontend/public/assets/fonts/Montserrat-ExtraBold.woff
deleted file mode 100644
index b17bf1bc..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraBold.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.ttf b/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.ttf
deleted file mode 100644
index c21a396b..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.woff b/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.woff
deleted file mode 100644
index dae25270..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraBoldItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraLight.ttf b/frontend/public/assets/fonts/Montserrat-ExtraLight.ttf
deleted file mode 100644
index f1b405ec..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraLight.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraLight.woff b/frontend/public/assets/fonts/Montserrat-ExtraLight.woff
deleted file mode 100644
index 4ccff60d..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraLight.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.ttf b/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.ttf
deleted file mode 100644
index 382293d2..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.woff b/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.woff
deleted file mode 100644
index 295ffef0..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ExtraLightItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Italic.ttf b/frontend/public/assets/fonts/Montserrat-Italic.ttf
deleted file mode 100644
index eee45ba9..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Italic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Italic.woff b/frontend/public/assets/fonts/Montserrat-Italic.woff
deleted file mode 100644
index 6ea91461..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Italic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Light.ttf b/frontend/public/assets/fonts/Montserrat-Light.ttf
deleted file mode 100644
index c5dfdb76..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Light.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Light.woff b/frontend/public/assets/fonts/Montserrat-Light.woff
deleted file mode 100644
index ff7cd8f2..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Light.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-LightItalic.ttf b/frontend/public/assets/fonts/Montserrat-LightItalic.ttf
deleted file mode 100644
index 5bdce7fb..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-LightItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-LightItalic.woff b/frontend/public/assets/fonts/Montserrat-LightItalic.woff
deleted file mode 100644
index 6f512e18..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-LightItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Medium.ttf b/frontend/public/assets/fonts/Montserrat-Medium.ttf
deleted file mode 100644
index dfc7e2fc..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Medium.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Medium.woff b/frontend/public/assets/fonts/Montserrat-Medium.woff
deleted file mode 100644
index be17a8bc..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Medium.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-MediumItalic.ttf b/frontend/public/assets/fonts/Montserrat-MediumItalic.ttf
deleted file mode 100644
index ce56883a..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-MediumItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-MediumItalic.woff b/frontend/public/assets/fonts/Montserrat-MediumItalic.woff
deleted file mode 100644
index 7daafa40..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-MediumItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Regular.ttf b/frontend/public/assets/fonts/Montserrat-Regular.ttf
deleted file mode 100644
index aa9033a8..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Regular.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Regular.woff b/frontend/public/assets/fonts/Montserrat-Regular.woff
deleted file mode 100644
index e77f1bc2..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Regular.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-SemiBold.ttf b/frontend/public/assets/fonts/Montserrat-SemiBold.ttf
deleted file mode 100644
index cbf44db9..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-SemiBold.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-SemiBold.woff b/frontend/public/assets/fonts/Montserrat-SemiBold.woff
deleted file mode 100644
index 4599da2a..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-SemiBold.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.ttf b/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.ttf
deleted file mode 100644
index 7f9153d2..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.woff b/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.woff
deleted file mode 100644
index f454d579..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-SemiBoldItalic.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Thin.ttf b/frontend/public/assets/fonts/Montserrat-Thin.ttf
deleted file mode 100644
index 7c90a547..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Thin.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-Thin.woff b/frontend/public/assets/fonts/Montserrat-Thin.woff
deleted file mode 100644
index 21a1f78e..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-Thin.woff and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ThinItalic.ttf b/frontend/public/assets/fonts/Montserrat-ThinItalic.ttf
deleted file mode 100644
index 94bcf553..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ThinItalic.ttf and /dev/null differ
diff --git a/frontend/public/assets/fonts/Montserrat-ThinItalic.woff b/frontend/public/assets/fonts/Montserrat-ThinItalic.woff
deleted file mode 100644
index 1878f907..00000000
Binary files a/frontend/public/assets/fonts/Montserrat-ThinItalic.woff and /dev/null differ
diff --git a/frontend/src/layouts/Layout.astro b/frontend/src/layouts/Layout.astro
index 0ba6345c..df71d6c0 100644
--- a/frontend/src/layouts/Layout.astro
+++ b/frontend/src/layouts/Layout.astro
@@ -1,4 +1,14 @@
---
+import "@fontsource/montserrat";
+import "@fontsource/montserrat/400.css";
+import "@fontsource/montserrat/500.css";
+import "@fontsource/montserrat/600.css";
+import "@fontsource/montserrat/700.css";
+import "@fontsource/montserrat/400-italic.css";
+import "@fontsource/montserrat/500-italic.css";
+import "@fontsource/montserrat/600-italic.css";
+import "@fontsource/montserrat/700-italic.css";
+
export interface Props {
title: string;
}
@@ -19,119 +29,6 @@ const { title } = Astro.props;
<slot />
<style is:global>
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Light.ttf") format("truetype");
- font-style: normal;
- font-weight: 400;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Medium.ttf") format("truetype");
- font-style: normal;
- font-weight: 500;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-SemiBold.ttf") format("truetype");
- font-style: normal;
- font-weight: 600;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Bold.ttf") format("truetype");
- font-style: normal;
- font-weight: 700;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-LightItalic.ttf") format("truetype");
- font-style: italic;
- font-weight: 400;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-MediumItalic.ttf") format("truetype");
- font-style: italic;
- font-weight: 500;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-SemiBoldItalic.ttf")
- format("truetype");
- font-style: italic;
- font-weight: 600;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-BoldItalic.ttf") format("truetype");
- font-style: italic;
- font-weight: 700;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Light.woff") format("woff");
- font-style: normal;
- font-weight: 400;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Medium.woff") format("woff");
- font-style: normal;
- font-weight: 500;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-SemiBold.woff") format("woff");
- font-style: normal;
- font-weight: 600;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-Bold.woff") format("woff");
- font-style: normal;
- font-weight: 700;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-LightItalic.woff") format("woff");
- font-style: italic;
- font-weight: 400;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-MediumItalic.woff") format("woff");
- font-style: italic;
- font-weight: 500;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-SemiBoldItalic.woff") format("woff");
- font-style: italic;
- font-weight: 600;
- }
-
- @font-face {
- font-family: Montserrat;
- src: url("/assets/fonts/Montserrat-BoldItalic.woff") format("woff");
- font-style: italic;
- font-weight: 700;
- }
-
html,
body {
position: relative;