diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx
index 21de6ae49..1efd9769a 100644
--- a/app/[lang]/(live)/layout.tsx
+++ b/app/[lang]/(live)/layout.tsx
@@ -50,7 +50,9 @@ export default async function RootLayout({
- {children}
+
+ {children}
+
diff --git a/app/globals.css b/app/globals.css
index 53fa2213c..93492eae1 100644
--- 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;
}
diff --git a/netlify.toml b/netlify.toml
index bad2e0af8..b9b7e9a07 100644
--- 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"]
\ No newline at end of file
+included_files = ["./.env"]
diff --git a/public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf b/public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf
deleted file mode 100644
index bacd48e2c..000000000
Binary files a/public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf and /dev/null differ
diff --git a/public/_static/fonts/biro-script-plus/regular.woff2 b/public/_static/fonts/biro-script-plus/regular.woff2
new file mode 100644
index 000000000..c930432b1
Binary files /dev/null and b/public/_static/fonts/biro-script-plus/regular.woff2 differ
diff --git a/public/_static/fonts/brandon/brandontextweb-black-webfont.woff b/public/_static/fonts/brandon-text/black.woff
similarity index 100%
rename from public/_static/fonts/brandon/brandontextweb-black-webfont.woff
rename to public/_static/fonts/brandon-text/black.woff
diff --git a/public/_static/fonts/brandon/brandontextweb-black-webfont.woff2 b/public/_static/fonts/brandon-text/black.woff2
similarity index 100%
rename from public/_static/fonts/brandon/brandontextweb-black-webfont.woff2
rename to public/_static/fonts/brandon-text/black.woff2
diff --git a/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff b/public/_static/fonts/brandon-text/bold.woff
similarity index 100%
rename from public/_static/fonts/brandon/brandontextweb-bold-webfont.woff
rename to public/_static/fonts/brandon-text/bold.woff
diff --git a/public/_static/fonts/brandon/brandontextweb-bold-webfont.woff2 b/public/_static/fonts/brandon-text/bold.woff2
similarity index 100%
rename from public/_static/fonts/brandon/brandontextweb-bold-webfont.woff2
rename to public/_static/fonts/brandon-text/bold.woff2
diff --git a/public/_static/fonts/fira-mono/FiraMono-Bold.ttf b/public/_static/fonts/fira-mono/FiraMono-Bold.ttf
deleted file mode 100644
index 23bc30f6c..000000000
Binary files a/public/_static/fonts/fira-mono/FiraMono-Bold.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-mono/FiraMono-Medium.ttf b/public/_static/fonts/fira-mono/FiraMono-Medium.ttf
deleted file mode 100644
index 793c60df1..000000000
Binary files a/public/_static/fonts/fira-mono/FiraMono-Medium.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-mono/FiraMono-Regular.ttf b/public/_static/fonts/fira-mono/FiraMono-Regular.ttf
deleted file mode 100644
index 67bbd4287..000000000
Binary files a/public/_static/fonts/fira-mono/FiraMono-Regular.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-mono/bold.woff2 b/public/_static/fonts/fira-mono/bold.woff2
new file mode 100644
index 000000000..c73968fc4
Binary files /dev/null and b/public/_static/fonts/fira-mono/bold.woff2 differ
diff --git a/public/_static/fonts/fira-mono/medium.woff2 b/public/_static/fonts/fira-mono/medium.woff2
new file mode 100644
index 000000000..bede8a97f
Binary files /dev/null and b/public/_static/fonts/fira-mono/medium.woff2 differ
diff --git a/public/_static/fonts/fira-mono/regular.woff2 b/public/_static/fonts/fira-mono/regular.woff2
new file mode 100644
index 000000000..ca3a0c87a
Binary files /dev/null and b/public/_static/fonts/fira-mono/regular.woff2 differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Black.ttf b/public/_static/fonts/fira-sans/FiraSans-Black.ttf
deleted file mode 100644
index 113cd3b44..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Black.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf
deleted file mode 100644
index 1c49fb240..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Bold.ttf b/public/_static/fonts/fira-sans/FiraSans-Bold.ttf
deleted file mode 100644
index e3593fb0f..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Bold.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf
deleted file mode 100644
index 305b0b8ba..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf b/public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf
deleted file mode 100644
index 83744c15a..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf
deleted file mode 100644
index 54bcacac7..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf b/public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf
deleted file mode 100644
index 2d4e33122..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf
deleted file mode 100644
index ef666adda..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Italic.ttf b/public/_static/fonts/fira-sans/FiraSans-Italic.ttf
deleted file mode 100644
index 27d32ed96..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Italic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Light.ttf b/public/_static/fonts/fira-sans/FiraSans-Light.ttf
deleted file mode 100644
index 663d1de50..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Light.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf
deleted file mode 100644
index d1b1fc586..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Medium.ttf b/public/_static/fonts/fira-sans/FiraSans-Medium.ttf
deleted file mode 100644
index 001ebe7e6..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Medium.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf
deleted file mode 100644
index b7640be00..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Regular.ttf b/public/_static/fonts/fira-sans/FiraSans-Regular.ttf
deleted file mode 100644
index 6f8064749..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Regular.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf b/public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf
deleted file mode 100644
index 0c93b7e68..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf
deleted file mode 100644
index e1a2989db..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-Thin.ttf b/public/_static/fonts/fira-sans/FiraSans-Thin.ttf
deleted file mode 100644
index c925f94a5..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-Thin.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf b/public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf
deleted file mode 100644
index dd39092f4..000000000
Binary files a/public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf and /dev/null differ
diff --git a/public/_static/fonts/fira-sans/black.woff2 b/public/_static/fonts/fira-sans/black.woff2
new file mode 100644
index 000000000..6095ed58b
Binary files /dev/null and b/public/_static/fonts/fira-sans/black.woff2 differ
diff --git a/public/_static/fonts/fira-sans/bold.woff2 b/public/_static/fonts/fira-sans/bold.woff2
new file mode 100644
index 000000000..4c550c7d4
Binary files /dev/null and b/public/_static/fonts/fira-sans/bold.woff2 differ
diff --git a/public/_static/fonts/fira-sans/light.woff2 b/public/_static/fonts/fira-sans/light.woff2
new file mode 100644
index 000000000..5c0e34d6b
Binary files /dev/null and b/public/_static/fonts/fira-sans/light.woff2 differ
diff --git a/public/_static/fonts/fira-sans/medium.woff2 b/public/_static/fonts/fira-sans/medium.woff2
new file mode 100644
index 000000000..7a1e5fc54
Binary files /dev/null and b/public/_static/fonts/fira-sans/medium.woff2 differ
diff --git a/public/_static/fonts/fira-sans/regular.woff2 b/public/_static/fonts/fira-sans/regular.woff2
new file mode 100644
index 000000000..e766e06cc
Binary files /dev/null and b/public/_static/fonts/fira-sans/regular.woff2 differ
diff --git a/public/_static/fonts/fira-sans/semibold.woff2 b/public/_static/fonts/fira-sans/semibold.woff2
new file mode 100644
index 000000000..bafabb5a1
Binary files /dev/null and b/public/_static/fonts/fira-sans/semibold.woff2 differ