diff --git a/assets/build/build.js b/assets/build/build.js index f2b703d59..cb67880c9 100644 --- a/assets/build/build.js +++ b/assets/build/build.js @@ -83,6 +83,8 @@ const htmlBuild = esbuild.build({ ], loader: { '.woff2': 'file', + // TODO: Remove when @fontsource/* removes legacy .woff + '.woff': 'file', }, }).catch(() => process.exit(1)) diff --git a/assets/css/_html.css b/assets/css/_html.css index 9d0d040d2..f69bdd752 100644 --- a/assets/css/_html.css +++ b/assets/css/_html.css @@ -1,4 +1,9 @@ -@import url('https://fonts.googleapis.com/css?family=Lato:300,700|Merriweather:300italic,300|Inconsolata:400,700'); +@import '@fontsource/lato/300.css'; +@import '@fontsource/lato/700.css'; +@import '@fontsource/merriweather/300.css'; +@import '@fontsource/merriweather/300-italic.css'; +@import '@fontsource/inconsolata/400.css'; +@import '@fontsource/inconsolata/700.css'; @import 'custom-props/common.css'; @import 'custom-props/theme-light.css'; diff --git a/assets/package-lock.json b/assets/package-lock.json index 073e9a350..d1baf2a84 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -7,6 +7,9 @@ "name": "ex_doc", "license": "Apache-2.0", "devDependencies": { + "@fontsource/inconsolata": "^4.5.7", + "@fontsource/lato": "^4.5.9", + "@fontsource/merriweather": "^4.5.13", "esbuild": "^0.15.7", "eslint": "^8.23.1", "eslint-config-standard": "^17.0.0", @@ -78,6 +81,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@fontsource/inconsolata": { + "version": "4.5.7", + "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-4.5.7.tgz", + "integrity": "sha512-yKas++IyswpH+ngiSRnjehQuDvmyrSi6MdVOWsjijoj3pO0ZQfqpvl35lo8CG3fuoVH23CMmVmDG9JqFjI/q0A==", + "dev": true + }, + "node_modules/@fontsource/lato": { + "version": "4.5.9", + "resolved": "https://registry.npmjs.org/@fontsource/lato/-/lato-4.5.9.tgz", + "integrity": "sha512-VkDnHBbPee/KMAUuBwe3rEKRDECo1MsA+I+ucZNU6FYdHrsv+SKpYgNr7nk/OhoaGrn9PrpXcmcd9eoD4J3Y6Q==", + "dev": true + }, + "node_modules/@fontsource/merriweather": { + "version": "4.5.13", + "resolved": "https://registry.npmjs.org/@fontsource/merriweather/-/merriweather-4.5.13.tgz", + "integrity": "sha512-VYPWyVtPvW8S4gGxWE+PdkVHNr44456Gkm49mD4qXmP8Zs2dPU8YG8an8KBIqHcPI6H74iGyll2+AohmGApkxw==", + "dev": true + }, "node_modules/@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", @@ -4348,6 +4369,24 @@ } } }, + "@fontsource/inconsolata": { + "version": "4.5.7", + "resolved": "https://registry.npmjs.org/@fontsource/inconsolata/-/inconsolata-4.5.7.tgz", + "integrity": "sha512-yKas++IyswpH+ngiSRnjehQuDvmyrSi6MdVOWsjijoj3pO0ZQfqpvl35lo8CG3fuoVH23CMmVmDG9JqFjI/q0A==", + "dev": true + }, + "@fontsource/lato": { + "version": "4.5.9", + "resolved": "https://registry.npmjs.org/@fontsource/lato/-/lato-4.5.9.tgz", + "integrity": "sha512-VkDnHBbPee/KMAUuBwe3rEKRDECo1MsA+I+ucZNU6FYdHrsv+SKpYgNr7nk/OhoaGrn9PrpXcmcd9eoD4J3Y6Q==", + "dev": true + }, + "@fontsource/merriweather": { + "version": "4.5.13", + "resolved": "https://registry.npmjs.org/@fontsource/merriweather/-/merriweather-4.5.13.tgz", + "integrity": "sha512-VYPWyVtPvW8S4gGxWE+PdkVHNr44456Gkm49mD4qXmP8Zs2dPU8YG8an8KBIqHcPI6H74iGyll2+AohmGApkxw==", + "dev": true + }, "@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", diff --git a/assets/package.json b/assets/package.json index beabb555c..78d519264 100644 --- a/assets/package.json +++ b/assets/package.json @@ -26,6 +26,9 @@ "homepage": "https://github.com/elixir-lang/ex_doc#readme", "browserslist": "last 2 versions", "devDependencies": { + "@fontsource/inconsolata": "^4.5.7", + "@fontsource/lato": "^4.5.9", + "@fontsource/merriweather": "^4.5.13", "esbuild": "^0.15.7", "eslint": "^8.23.1", "eslint-config-standard": "^17.0.0",