feat: convert all fonts to woff2 format

2024-06-03 10:41:05 +02:00
parent 1095bcbe9d
commit 04a3e8a946
39 changed files with 49 additions and 20 deletions
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -50,7 +50,9 @@ export default async function RootLayout({
      </head>
      <body>
        <TrpcProvider lang={params.lang}>
-              <Header lang={params.lang} languageSwitcher={languageSwitcher} />{children}</TrpcProvider>
+          <Header lang={params.lang} languageSwitcher={languageSwitcher} />
+          {children}
+        </TrpcProvider>
        <Script id="page-tracking">{`
          typeof _satellite !== "undefined" && _satellite.pageBottom();
        `}</Script>
--- a/app/globals.css
+++ b/app/globals.css
@@ -1,75 +1,102 @@
@font-face {
+  font-display: swap;
  font-family: "biro script plus";
  font-style: normal;
-  font-weight: 500;
-  src: url(/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf);
+  font-weight: 400;
+  src: url(/_static/fonts/biro-script-plus/regular.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
  font-family: "brandon text";
  font-weight: 700;
-  src: url(/_static/fonts/brandon/brandontextweb-bold-webfont.woff),
-    url(/_static/fonts/brandon/brandontextweb-bold-webfont.woff2);
+  src:
+    url(/_static/fonts/brandon-text/bold.woff2) format("woff2"),
+    url(/_static/fonts/brandon-text/bold.woff) format("woff");
 }

@font-face {
+  font-display: swap;
  font-family: "brandon text";
  font-weight: 900;
-  src: url(/_static/fonts/brandon/brandontextweb-black-webfont.woff),
-    url(/_static/fonts/brandon/brandontextweb-black-webfont.woff2);
+  src:
+    url(/_static/fonts/brandon-text/black.woff2) format("woff2"),
+    url(/_static/fonts/brandon-text/black.woff) format("woff");
 }

@font-face {
+  font-display: swap;
  font-family: "fira mono";
  font-style: normal;
  font-weight: 400;
-  src: url(/_static/fonts/fira-mono/FiraMono-Regular.ttf);
+  src: url(/_static/fonts/fira-mono/regular.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
  font-family: "fira mono";
  font-style: normal;
  font-weight: 500;
-  src: url(/_static/fonts/fira-mono/FiraMono-Medium.ttf);
+  src: url(/_static/fonts/fira-mono/medium.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
  font-family: "fira mono";
  font-style: normal;
  font-weight: 700;
-  src: url(/_static/fonts/fira-mono/FiraMono-Bold.ttf);
+  src: url(/_static/fonts/fira-mono/bold.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
  font-family: "fira sans";
  font-style: normal;
  font-weight: 300;
-  src: url(/_static/fonts/fira-sans/FiraSans-Light.ttf);
+  src: url(/_static/fonts/fira-sans/light.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
  font-family: "fira sans";
  font-style: normal;
  font-weight: 400;
-  src: url(/_static/fonts/fira-sans/FiraSans-Regular.ttf);
+  src: url(/_static/fonts/fira-sans/regular.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
+  font-family: "fira sans";
+  font-style: normal;
+  font-weight: 500;
+  src: url(/_static/fonts/fira-sans/medium.woff2) format("woff2");
+}
+
+@font-face {
+  font-display: swap;
  font-family: "fira sans";
  font-style: normal;
  font-weight: 600;
-  src: url(/_static/fonts/fira-sans/FiraSans-SemiBold.ttf);
+  src: url(/_static/fonts/fira-sans/semibold.woff2) format("woff2");
 }

@font-face {
+  font-display: swap;
+  font-family: "fira sans";
+  font-style: normal;
+  font-weight: 700;
+  src: url(/_static/fonts/fira-sans/bold.woff2) format("woff2");
+}
+
+@font-face {
+  font-display: swap;
  font-family: "fira sans";
  font-style: normal;
  font-weight: 900;
-  src: url(/_static/fonts/fira-sans/FiraSans-Black.ttf);
+  src: url(/_static/fonts/fira-sans/black.woff2) format("woff2");
 }

 :root {
-  font-size: 62.5%;
  --max-width: 113.5rem;
 }

--- a/netlify.toml
+++ b/netlify.toml
@@ -13,9 +13,9 @@ package = "netlify-plugin-cypress"
 [plugins.inputs]
 configFile = "cypress.config.ts"
 [plugins.inputs.postBuild]
-enable = true
-start = "npm start"
-wait-on = "http://127.0.0.1:3000/en/test"
+enable = true 
+start = "npm start" 
+wait-on = "http://127.0.0.1:3000/en/test" 
 wait-on-timeout = "30" # seconds

 [build.environment]
@@ -29,7 +29,7 @@ TERM = "xterm"
 package = "@netlify/plugin-nextjs"

 [images]
-  remote_images = ["https://imagevault-stage.scandichotels.com.*", "https://imagevault.scandichotels.com.*"]
+remote_images = ["https://imagevault-stage.scandichotels.com.*", "https://imagevault.scandichotels.com.*"]

 [functions]
-  included_files = ["./.env"]
+included_files = ["./.env"]
--- a/public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf
+++ b/public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf
--- a/public/_static/fonts/biro-script-plus/regular.woff2
+++ b/public/_static/fonts/biro-script-plus/regular.woff2
--- a/public/_static/fonts/brandon/brandontextweb-black-webfont.woff
+++ b/public/_static/fonts/brandon/brandontextweb-black-webfont.woff
--- a/public/_static/fonts/brandon/brandontextweb-black-webfont.woff2
+++ b/public/_static/fonts/brandon/brandontextweb-black-webfont.woff2
--- a/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff
+++ b/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff
--- a/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff2
+++ b/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff2
--- a/public/_static/fonts/fira-mono/FiraMono-Bold.ttf
+++ b/public/_static/fonts/fira-mono/FiraMono-Bold.ttf
--- a/public/_static/fonts/fira-mono/FiraMono-Medium.ttf
+++ b/public/_static/fonts/fira-mono/FiraMono-Medium.ttf
--- a/public/_static/fonts/fira-mono/FiraMono-Regular.ttf
+++ b/public/_static/fonts/fira-mono/FiraMono-Regular.ttf
--- a/public/_static/fonts/fira-mono/bold.woff2
+++ b/public/_static/fonts/fira-mono/bold.woff2
--- a/public/_static/fonts/fira-mono/medium.woff2
+++ b/public/_static/fonts/fira-mono/medium.woff2
--- a/public/_static/fonts/fira-mono/regular.woff2
+++ b/public/_static/fonts/fira-mono/regular.woff2
--- a/public/_static/fonts/fira-sans/FiraSans-Black.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Black.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Bold.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Bold.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Italic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Italic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Light.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Light.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Medium.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Medium.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Regular.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Regular.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-Thin.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-Thin.ttf
--- a/public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf
+++ b/public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf
--- a/public/_static/fonts/fira-sans/black.woff2
+++ b/public/_static/fonts/fira-sans/black.woff2
--- a/public/_static/fonts/fira-sans/bold.woff2
+++ b/public/_static/fonts/fira-sans/bold.woff2
--- a/public/_static/fonts/fira-sans/light.woff2
+++ b/public/_static/fonts/fira-sans/light.woff2
--- a/public/_static/fonts/fira-sans/medium.woff2
+++ b/public/_static/fonts/fira-sans/medium.woff2
--- a/public/_static/fonts/fira-sans/regular.woff2
+++ b/public/_static/fonts/fira-sans/regular.woff2
--- a/public/_static/fonts/fira-sans/semibold.woff2
+++ b/public/_static/fonts/fira-sans/semibold.woff2