Packages and banners from the CMS, host injection, translation files and the contact form #19
@@ -78,7 +78,12 @@ Conclusion for Bryan to confirm: the twigs are images from the theme and fall un
|
||||
|
||||
## Fonts
|
||||
|
||||
Marcellus (headings) and Jost (text) via the npm packages `@fontsource/marcellus` and `@fontsource/jost`, both under the SIL Open Font License 1.1, served from the site itself (no Google Fonts request).
|
||||
Cormorant Garamond (headings, weights 500 and 600) and Mulish (text, nav and buttons, weights 300, 400 and 500), the main fonts of the live site, self-hosted through the npm packages `@fontsource/cormorant-garamond` and `@fontsource/mulish` (version 5.3.0). Both fonts are Google Fonts under the SIL Open Font License 1.1 (free for commercial use and for self-hosting; the licence text ships in the packages), so there is no theme licence involved. Only the latin subset and the weights in use are loaded (about 100 KB of WOFF2 in total), with no request to Google. The previous fonts, Marcellus and Jost, were replaced.
|
||||
|
||||
- Layout shift: `src/fonts.css` defines two fallback faces ("Cormorant Garamond Fallback" on Georgia, "Mulish Fallback" on Arial) with `size-adjust`, `ascent-override` and `descent-override` computed from the font files, so the text barely moves when the web fonts arrive (measured layout shift of the pages: 0.001 to 0.016 on desktop and phone, as before).
|
||||
- Size: Cormorant Garamond has a smaller x-height than Marcellus (0.386 against 0.50), so every use of the heading font carries `font-size-adjust: 0.43` (about 12% larger letters; browsers that do not know the property show the font at its natural size). Prices use lining numerals (`font-variant-numeric: lining-nums`), because the default figures of Cormorant Garamond are old-style. Headings use weight 500 instead of 400 (Cormorant is thin at 400).
|
||||
- No font preload is used (the images are the largest content of the first screen); the fallback metrics keep the first paint stable.
|
||||
- The CSP is unchanged (`font-src 'self'`).
|
||||
|
||||
## When you add an image
|
||||
|
||||
|
||||
@@ -54,8 +54,10 @@
|
||||
"dependencies": {
|
||||
"@chakra-ui/react": "^3.37.0",
|
||||
"@emotion/react": "^11.14.0",
|
||||
"@fontsource/cormorant-garamond": "^5.3.0",
|
||||
"@fontsource/jost": "^5.3.0",
|
||||
"@fontsource/marcellus": "^5.3.0",
|
||||
"@fontsource/mulish": "^5.3.0",
|
||||
"@friendlycaptcha/sdk": "^1.1.3",
|
||||
"@sentry/react": "^11.8.0",
|
||||
"@tanstack/react-router": "1.170.46",
|
||||
|
||||
Generated
+16
@@ -178,12 +178,18 @@ importers:
|
||||
'@emotion/react':
|
||||
specifier: ^11.14.0
|
||||
version: 11.14.0(@types/react@19.3.0)(react@19.3.0)(supports-color@5.5.0)
|
||||
'@fontsource/cormorant-garamond':
|
||||
specifier: ^5.3.0
|
||||
version: 5.3.0
|
||||
'@fontsource/jost':
|
||||
specifier: ^5.3.0
|
||||
version: 5.3.0
|
||||
'@fontsource/marcellus':
|
||||
specifier: ^5.3.0
|
||||
version: 5.3.0
|
||||
'@fontsource/mulish':
|
||||
specifier: ^5.3.0
|
||||
version: 5.3.0
|
||||
'@friendlycaptcha/sdk':
|
||||
specifier: ^1.1.3
|
||||
version: 1.1.3
|
||||
@@ -740,12 +746,18 @@ packages:
|
||||
'@floating-ui/utils@0.2.12':
|
||||
resolution: {integrity: sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==}
|
||||
|
||||
'@fontsource/cormorant-garamond@5.3.0':
|
||||
resolution: {integrity: sha512-weuGsCirGVWBWqpt6YUp0yLThTe4G8YO45noq8wxeJCRvEpq5lFrxNMFSTxcyOyV5k5otzJ8guDzYegdYlcLMQ==}
|
||||
|
||||
'@fontsource/jost@5.3.0':
|
||||
resolution: {integrity: sha512-lORv5y49hSoLVxjGb0qNuBzXvnaNYI3B94200uGPGJFei8fao6d6LLz2ziWbOZubGfZnibzuT6GVNX8fBw8WQQ==}
|
||||
|
||||
'@fontsource/marcellus@5.3.0':
|
||||
resolution: {integrity: sha512-cMnanjpiPIC7Rq4GXIA/Zal5WLSoDV5Mc681tMkWsWfKHXnRnLGlhuGeBnLF6HrqtFkiSdiuy4NCSPfOrz266w==}
|
||||
|
||||
'@fontsource/mulish@5.3.0':
|
||||
resolution: {integrity: sha512-Fru/fmJwg4ZlKUU4jELz6/guZhba6Lz1vraAROqooYnUbtj1iMi7BXFkQU7AkB6QP5swpvwRnO5chUp6mNh5mA==}
|
||||
|
||||
'@formatjs/ecma402-abstract@2.3.6':
|
||||
resolution: {integrity: sha512-HJnTFeRM2kVFVr5gr5kH1XP6K0JcJtE7Lzvtr3FS/so5f1kpsqqqxy5JF+FRaO6H2qmcMfAUIox7AJteieRtVw==}
|
||||
|
||||
@@ -4706,10 +4718,14 @@ snapshots:
|
||||
|
||||
'@floating-ui/utils@0.2.12': {}
|
||||
|
||||
'@fontsource/cormorant-garamond@5.3.0': {}
|
||||
|
||||
'@fontsource/jost@5.3.0': {}
|
||||
|
||||
'@fontsource/marcellus@5.3.0': {}
|
||||
|
||||
'@fontsource/mulish@5.3.0': {}
|
||||
|
||||
'@formatjs/ecma402-abstract@2.3.6':
|
||||
dependencies:
|
||||
'@formatjs/fast-memoize': 2.2.7
|
||||
|
||||
@@ -60,6 +60,7 @@ export default function FaqList({
|
||||
minH="2.75rem"
|
||||
py={5}
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize="1.25rem"
|
||||
color="ink"
|
||||
cursor="pointer"
|
||||
|
||||
@@ -105,6 +105,7 @@ export default function MobileNav({
|
||||
}
|
||||
display="block"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize="1.9rem"
|
||||
color="ink"
|
||||
_currentPage={{ color: 'accent' }}
|
||||
|
||||
@@ -38,6 +38,7 @@ export default function MobileNavGroup({
|
||||
onClick={() => dispatch({ type: 'linkChosen' })}
|
||||
display="block"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize="1.9rem"
|
||||
color={isSectionCurrent(item, pathname) ? 'accent' : 'ink'}
|
||||
_currentPage={{ color: 'accent' }}
|
||||
@@ -97,6 +98,7 @@ export default function MobileNavGroup({
|
||||
alignItems="center"
|
||||
minH="44px"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize="1.4rem"
|
||||
color="ink"
|
||||
// accent.deep: 1.4rem is not large text
|
||||
|
||||
@@ -51,6 +51,8 @@ export default function PackageBlock({
|
||||
</Heading>
|
||||
<Text
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontVariantNumeric="lining-nums"
|
||||
fontSize="2.25rem"
|
||||
lineHeight="1.2"
|
||||
color="accent.deep"
|
||||
|
||||
@@ -140,6 +140,7 @@ export default function ProcessTimeline({
|
||||
<Heading
|
||||
as="h3"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontWeight="normal"
|
||||
fontSize="xl"
|
||||
lineHeight="1.2"
|
||||
|
||||
@@ -73,6 +73,8 @@ export default function PriceCard({ pkg }: PriceCardProps) {
|
||||
{/* accent.deep instead of the design's accent: meets 4.5:1 (NFR-HP-01) */}
|
||||
<Text
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontVariantNumeric="lining-nums"
|
||||
fontSize="2.25rem"
|
||||
lineHeight="1"
|
||||
color="accent.deep"
|
||||
|
||||
@@ -41,6 +41,7 @@ export default function PriceTopBar({ banner }: PriceTopBarProps) {
|
||||
<Text
|
||||
as="strong"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontWeight="normal"
|
||||
fontSize="0.8125rem"
|
||||
letterSpacing="0.14em"
|
||||
|
||||
@@ -109,6 +109,7 @@ export default function TestimonialCarousel({
|
||||
minW="56px"
|
||||
textAlign="center"
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize="16px"
|
||||
letterSpacing="0.08em"
|
||||
color="ink.soft"
|
||||
|
||||
@@ -94,6 +94,7 @@ export default function TestimonialSlide({
|
||||
>
|
||||
<Text
|
||||
fontFamily="heading"
|
||||
fontSizeAdjust="0.43"
|
||||
fontSize={{ base: '19px', lg: '21px' }}
|
||||
letterSpacing="0.2em"
|
||||
textTransform="uppercase"
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
/* Fallback faces with the metrics of the web fonts, so the text does not jump
|
||||
when Cormorant Garamond and Mulish arrive (font-display: swap). Each one is a
|
||||
system font scaled to the width of the web font and given its vertical
|
||||
metrics. Numbers: average advance width of the web font divided by that of
|
||||
the system font (Dutch letter frequencies); ascent and descent of the web
|
||||
font divided by the size adjustment. */
|
||||
@font-face {
|
||||
font-family: 'Cormorant Garamond Fallback';
|
||||
src: local('Georgia');
|
||||
size-adjust: 88.6%;
|
||||
ascent-override: 104.3%;
|
||||
descent-override: 32.4%;
|
||||
line-gap-override: 0%;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Mulish Fallback';
|
||||
src: local('Arial');
|
||||
size-adjust: 104.3%;
|
||||
ascent-override: 96.4%;
|
||||
descent-override: 24%;
|
||||
line-gap-override: 0%;
|
||||
}
|
||||
@@ -12,10 +12,14 @@ import siteContent from '../content/siteContent';
|
||||
import { siteHead } from '../seo';
|
||||
import system from '../theme';
|
||||
|
||||
import '@fontsource/jost/300.css';
|
||||
import '@fontsource/jost/400.css';
|
||||
import '@fontsource/jost/500.css';
|
||||
import '@fontsource/marcellus/400.css';
|
||||
// Cormorant Garamond for headings, Mulish for text and buttons (the fonts of
|
||||
// the live site), self-hosted; only the latin subset and the weights in use
|
||||
import '@fontsource/cormorant-garamond/latin-500.css';
|
||||
import '@fontsource/cormorant-garamond/latin-600.css';
|
||||
import '@fontsource/mulish/latin-300.css';
|
||||
import '@fontsource/mulish/latin-400.css';
|
||||
import '@fontsource/mulish/latin-500.css';
|
||||
import '../fonts.css';
|
||||
|
||||
// Devtools alleen tijdens het ontwikkelen; ze komen niet in de productiebuild
|
||||
const RouterDevtools = import.meta.env.DEV
|
||||
|
||||
+14
-5
@@ -62,12 +62,15 @@ const config = defineConfig({
|
||||
},
|
||||
'.cms-offering h3': {
|
||||
fontFamily: '{fonts.heading}',
|
||||
fontWeight: 'normal',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontWeight: '500',
|
||||
fontSize: '1.5rem',
|
||||
margin: '0 0 0.75rem',
|
||||
},
|
||||
'.cms-price': {
|
||||
fontFamily: '{fonts.heading}',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontVariantNumeric: 'lining-nums',
|
||||
fontSize: '2.25rem',
|
||||
lineHeight: 1,
|
||||
color: '{colors.accent.deep}',
|
||||
@@ -99,7 +102,8 @@ const config = defineConfig({
|
||||
},
|
||||
'.cms-banner strong': {
|
||||
fontFamily: '{fonts.heading}',
|
||||
fontWeight: 'normal',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontWeight: '500',
|
||||
letterSpacing: '0.14em',
|
||||
textTransform: 'uppercase',
|
||||
color: '{colors.ink}',
|
||||
@@ -154,10 +158,10 @@ const config = defineConfig({
|
||||
},
|
||||
fonts: {
|
||||
heading: {
|
||||
value: "'Marcellus', 'Iowan Old Style', Georgia, 'Times New Roman', serif",
|
||||
value: "'Cormorant Garamond', 'Cormorant Garamond Fallback', Georgia, 'Times New Roman', serif",
|
||||
},
|
||||
body: {
|
||||
value: "'Jost', 'Helvetica Neue', Helvetica, Arial, sans-serif",
|
||||
value: "'Mulish', 'Mulish Fallback', 'Helvetica Neue', Helvetica, Arial, sans-serif",
|
||||
},
|
||||
},
|
||||
fontSizes: {
|
||||
@@ -274,6 +278,7 @@ const config = defineConfig({
|
||||
display: {
|
||||
value: {
|
||||
fontFamily: 'heading',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontSize: { base: '2.75rem', md: '3.75rem', xl: '5rem' },
|
||||
lineHeight: '1',
|
||||
},
|
||||
@@ -283,6 +288,7 @@ const config = defineConfig({
|
||||
sectionHeading: {
|
||||
value: {
|
||||
fontFamily: 'heading',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontSize: { base: '1.625rem', md: '1.875rem' },
|
||||
lineHeight: '1.15',
|
||||
letterSpacing: 'caps',
|
||||
@@ -295,6 +301,7 @@ const config = defineConfig({
|
||||
sectionTitle: {
|
||||
value: {
|
||||
fontFamily: 'heading',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontSize: '1.875rem',
|
||||
lineHeight: '1.15',
|
||||
},
|
||||
@@ -311,6 +318,7 @@ const config = defineConfig({
|
||||
pageTitle: {
|
||||
value: {
|
||||
fontFamily: 'heading',
|
||||
fontSizeAdjust: '0.43',
|
||||
fontSize: { base: '2.25rem', md: '2.75rem', lg: '3.25rem' },
|
||||
lineHeight: '1.15',
|
||||
},
|
||||
@@ -320,7 +328,8 @@ const config = defineConfig({
|
||||
// Koppen zijn in het design niet vet en iets gespatieerd
|
||||
heading: {
|
||||
base: {
|
||||
fontWeight: '400',
|
||||
fontWeight: '500',
|
||||
fontSizeAdjust: '0.43',
|
||||
letterSpacing: '0.01em',
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user