diff --git a/app/layout.js b/app/layout.js index 651936b49..f61693c4e 100644 --- a/app/layout.js +++ b/app/layout.js @@ -1,8 +1,42 @@ +import localFont from 'next/font/local'; + +import '/styles/global.scss'; import styles from './styles.module.scss'; +const CenturyNovaSB = localFont({ + src: [ + { + path: '../fonts/CenturyNovaSBRoman/font.woff', + weight: '400', + style: 'normal', + }, + { + path: '../fonts/CenturyNovaSBItalic/font.woff', + weight: '400', + style: 'italic', + }, + ], + variable: '--font-century-nova-sb', +}); +const Dia = localFont({ + src: [ + { + path: '../fonts/DiaRegular/Dia Regular.woff', + weight: '400', + style: 'normal', + }, + { + path: '../fonts/DiaLight/Dia Light.woff', + weight: '100', + style: 'normal', + }, + ], + variable: '--font-dia', +}); + export default function RootLayout({ children }) { return ( - + {children} ); diff --git a/app/styles.module.scss b/app/styles.module.scss index dac37f5bd..36032c2d3 100644 --- a/app/styles.module.scss +++ b/app/styles.module.scss @@ -2,4 +2,14 @@ .body { background-color: colors.$grey-tint; + + font-family: var(--font-dia); + + color: colors.$black; + + a, + a:visited { + color: colors.$black; + text-decoration: none; + } } diff --git a/fonts/CenturyNovaSBItalic/font.woff b/fonts/CenturyNovaSBItalic/font.woff new file mode 100755 index 000000000..bbe3d6d84 Binary files /dev/null and b/fonts/CenturyNovaSBItalic/font.woff differ diff --git a/fonts/CenturyNovaSBItalic/font.woff2 b/fonts/CenturyNovaSBItalic/font.woff2 new file mode 100755 index 000000000..5c2a59b12 Binary files /dev/null and b/fonts/CenturyNovaSBItalic/font.woff2 differ diff --git a/fonts/CenturyNovaSBRoman/font.woff b/fonts/CenturyNovaSBRoman/font.woff new file mode 100755 index 000000000..78143623a Binary files /dev/null and b/fonts/CenturyNovaSBRoman/font.woff differ diff --git a/fonts/CenturyNovaSBRoman/font.woff2 b/fonts/CenturyNovaSBRoman/font.woff2 new file mode 100755 index 000000000..71ea3b420 Binary files /dev/null and b/fonts/CenturyNovaSBRoman/font.woff2 differ diff --git a/fonts/DiaLight/.smbdeleteAAA2e3e4.4 b/fonts/DiaLight/.smbdeleteAAA2e3e4.4 new file mode 100755 index 000000000..97a136972 Binary files /dev/null and b/fonts/DiaLight/.smbdeleteAAA2e3e4.4 differ diff --git a/fonts/DiaLight/Dia Light.eot b/fonts/DiaLight/Dia Light.eot new file mode 100755 index 000000000..457b8160e Binary files /dev/null and b/fonts/DiaLight/Dia Light.eot differ diff --git a/fonts/DiaLight/Dia Light.woff b/fonts/DiaLight/Dia Light.woff new file mode 100755 index 000000000..c4e9b5731 Binary files /dev/null and b/fonts/DiaLight/Dia Light.woff differ diff --git a/fonts/DiaRegular/.smbdeleteAAA2e4a4.4 b/fonts/DiaRegular/.smbdeleteAAA2e4a4.4 new file mode 100755 index 000000000..f775fcc14 Binary files /dev/null and b/fonts/DiaRegular/.smbdeleteAAA2e4a4.4 differ diff --git a/fonts/DiaRegular/Dia Regular.eot b/fonts/DiaRegular/Dia Regular.eot new file mode 100755 index 000000000..bd05603a0 Binary files /dev/null and b/fonts/DiaRegular/Dia Regular.eot differ diff --git a/fonts/DiaRegular/Dia Regular.woff b/fonts/DiaRegular/Dia Regular.woff new file mode 100755 index 000000000..d21d3021e Binary files /dev/null and b/fonts/DiaRegular/Dia Regular.woff differ diff --git a/fonts/Inter-Bold.ttf b/fonts/Inter-Bold.ttf deleted file mode 100644 index 8e82c70d1..000000000 Binary files a/fonts/Inter-Bold.ttf and /dev/null differ diff --git a/package.json b/package.json index 00e4e1b51..89d7785ad 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "prettier": "^2.8.8", "prettier-plugin-tailwindcss": "^0.3.0", "sass": "^1.63.6", + "scss-reset": "^1.4.2", "tailwindcss": "^3.3.2", "typescript": "5.1.3" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51dc14096..28b552807 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -88,6 +88,9 @@ devDependencies: sass: specifier: ^1.63.6 version: 1.63.6 + scss-reset: + specifier: ^1.4.2 + version: 1.4.2 tailwindcss: specifier: ^3.3.2 version: 3.3.2 @@ -3033,6 +3036,10 @@ packages: loose-envify: 1.4.0 dev: false + /scss-reset@1.4.2: + resolution: {integrity: sha512-eXtSeI5APjD/TtaIlRdiMRapgsX5GCP4I1Ti3FiUzCSE4GEYnfT1hGISrJkKGZsZbCDhwZv1bUdOOZfPGs3R1A==} + dev: true + /semver@5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true diff --git a/styles/global.scss b/styles/global.scss new file mode 100644 index 000000000..1c607b6e0 --- /dev/null +++ b/styles/global.scss @@ -0,0 +1 @@ +@use 'scss-reset/reset';