From 4a0551c731eacb64d21555e26683870bca232725 Mon Sep 17 00:00:00 2001 From: Lyn Fugmann Date: Fri, 20 Sep 2024 13:22:58 +0200 Subject: [PATCH] use better source for aileron font the previous one had incorrect font weight variants --- .gitmodules | 3 +++ README.md | 1 + _layouts/page.njk | 2 +- eleventy.config.js | 4 ++-- package-lock.json | 10 +--------- package.json | 3 +-- submodules/aileron | 1 + 7 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 .gitmodules create mode 160000 submodules/aileron diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..274bd38 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/aileron"] + path = submodules/aileron + url = https://github.com/reinhart1010/aileron diff --git a/README.md b/README.md index b267cf8..a39154e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ This is the WIP rewrite of the ESE website. To build the website, install the dependencies and run the build script: ```sh +git submodule update --init npm install npm run build ``` diff --git a/_layouts/page.njk b/_layouts/page.njk index c8ba34f..a460dea 100644 --- a/_layouts/page.njk +++ b/_layouts/page.njk @@ -10,7 +10,7 @@ eleventyComputed: {% if title %}{{ title }} | {% endif %}ESE {{ year }} - + {% include 'header.njk' %} diff --git a/eleventy.config.js b/eleventy.config.js index c57c18e..05255df 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -20,8 +20,8 @@ module.exports = function(eleventyConfig) { return value.filter(item => item.page.lang === this.page.lang) }); - eleventyConfig.addPassthroughCopy({'./node_modules/@fontsource/aileron/latin.css': 'fonts/aileron.css'}) - eleventyConfig.addPassthroughCopy({'./node_modules/@fontsource/aileron/files': 'fonts/files'}) + eleventyConfig.addPassthroughCopy({'./submodules/aileron/fonts/*.(ttf|woff|woff2)': 'fonts'}) + eleventyConfig.addPassthroughCopy({'./submodules/aileron/aileron.lite.min.css': 'aileron.lite.min.css'}) // copy german start page to root url eleventyConfig.on( diff --git a/package-lock.json b/package-lock.json index f92fc3d..123cc79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,7 @@ "devDependencies": { "@11ty/eleventy": "^2.0.1", "@11ty/eleventy-navigation": "^0.3.5", - "@11ty/eleventy-plugin-bundle": "^1.0.5", - "@fontsource/aileron": "^5.1.0" + "@11ty/eleventy-plugin-bundle": "^1.0.5" } }, "node_modules/@11ty/dependency-tree": { @@ -222,13 +221,6 @@ "node": ">=6.9.0" } }, - "node_modules/@fontsource/aileron": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@fontsource/aileron/-/aileron-5.1.0.tgz", - "integrity": "sha512-w204VNAH1a6VdKDn0vi7u8VAnTRH8tme485inHFYH0hUgnaRhY6Us8V75/10AqH8sCW3SuoTMbfg4/6B8y2jWQ==", - "dev": true, - "license": "CC0-1.0" - }, "node_modules/@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", diff --git a/package.json b/package.json index 29a4fb6..9469e3f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "devDependencies": { "@11ty/eleventy": "^2.0.1", "@11ty/eleventy-navigation": "^0.3.5", - "@11ty/eleventy-plugin-bundle": "^1.0.5", - "@fontsource/aileron": "^5.1.0" + "@11ty/eleventy-plugin-bundle": "^1.0.5" } } diff --git a/submodules/aileron b/submodules/aileron new file mode 160000 index 0000000..0b12b2b --- /dev/null +++ b/submodules/aileron @@ -0,0 +1 @@ +Subproject commit 0b12b2b472f8f580b4807b3f5d3ac7bdde331497