refactor: fonts as npm dependencies

flxzt · Jun 16, 2024 · 7bb2389 · 7bb2389
1 parent 76e2bb0
commit 7bb2389
Show file tree

Hide file tree

Showing 548 changed files with 6,162 additions and 35 deletions.
diff --git a/.github/workflows/zola.yml b/.github/workflows/zola.yml
@@ -11,12 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout main
-        uses: actions/checkout@v3
-      - name: Prerequisites
-        run: |
-          sudo apt-get install -y npm
-          npm ci
-          npm run post-update
+        uses: actions/checkout@v4
       - name: Build and deploy
         uses: shalzz/zola-deploy-action@master
         env:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 public/
 static/processed_images
-node_modules/
+/node_modules/
diff --git a/README.md b/README.md
@@ -239,6 +239,15 @@ Write a caption with:
 {{ caption(text="This is the caption text") }}
 ```
 
+## Update NPM dependencies
+
+Run the following from the root theme directory:
+
+```bash
+npm install
+npm run post-update
+```
+
 ### License
 
 <sup>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,11 @@
 {
   "dependencies": {
+    "@fontsource/roboto": "5.0.13",
+    "@fontsource/merriweather": "^5.0.13",
+    "@fontsource/inconsolata": "^5.0.18",
     "elevator.js": "^1.0.1"
   },
   "scripts": {
     "post-update": "npm install --prefix ./static/ --only=production"
   }
-}
+}
diff --git a/sass/fonts.scss b/sass/fonts.scss
diff --git a/static/fonts/Inconsolata/inconsolata-all-400-normal.woff b/static/fonts/Inconsolata/inconsolata-all-400-normal.woff
diff --git a/static/fonts/Inconsolata/inconsolata-latin-400-normal.woff2 b/static/fonts/Inconsolata/inconsolata-latin-400-normal.woff2
diff --git a/static/fonts/Merriweather/merriweather-all-400-normal.woff b/static/fonts/Merriweather/merriweather-all-400-normal.woff
diff --git a/static/fonts/Roboto/roboto-all-400-normal.woff b/static/fonts/Roboto/roboto-all-400-normal.woff
diff --git a/static/js/main.js b/static/js/main.js
@@ -1,3 +1,7 @@
+// Fonts
+import "/static/@fontsource/merriweather";
+import "/static/@fontsource/merriweather";
+
 // Elevator
 window.addEventListener('scroll', e => {
     const threshold = 300;

diff --git a/static/node_modules/.package-lock.json b/static/node_modules/.package-lock.json
diff --git a/static/node_modules/@fontsource/inconsolata/200.css b/static/node_modules/@fontsource/inconsolata/200.css
diff --git a/static/node_modules/@fontsource/inconsolata/300.css b/static/node_modules/@fontsource/inconsolata/300.css
diff --git a/static/node_modules/@fontsource/inconsolata/400.css b/static/node_modules/@fontsource/inconsolata/400.css
diff --git a/static/node_modules/@fontsource/inconsolata/500.css b/static/node_modules/@fontsource/inconsolata/500.css
diff --git a/static/node_modules/@fontsource/inconsolata/600.css b/static/node_modules/@fontsource/inconsolata/600.css
diff --git a/static/node_modules/@fontsource/inconsolata/700.css b/static/node_modules/@fontsource/inconsolata/700.css
diff --git a/static/node_modules/@fontsource/inconsolata/800.css b/static/node_modules/@fontsource/inconsolata/800.css
diff --git a/static/node_modules/@fontsource/inconsolata/900.css b/static/node_modules/@fontsource/inconsolata/900.css
diff --git a/static/node_modules/@fontsource/inconsolata/CHANGELOG.md b/static/node_modules/@fontsource/inconsolata/CHANGELOG.md