Skip to content

Commit 0df548c

Browse files
committed
Merge branch 'master' into feat/reserve_branche
2 parents f85ca42 + 0fe51ff commit 0df548c

File tree

6 files changed

+11
-1060
lines changed

6 files changed

+11
-1060
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ dependencies. Install them with:
2828
npm install
2929
```
3030

31+
This project uses **npm** for managing JavaScript dependencies and tracks
32+
exact versions in `package-lock.json`.
33+
3134
Bundled JavaScript is compiled from the source files in `assets/js/`. Run the
3235
following to create `main.min.js` (minified with a banner) or watch for changes:
3336

_includes/head.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
1818
<link rel="preload" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5/css/all.min.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
1919
<noscript><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5/css/all.min.css"></noscript>
20+
<!-- Google Fonts -->
21+
<link rel="preconnect" href="https://fonts.googleapis.com">
22+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
23+
<link href="https://fonts.googleapis.com/css2?family=Cardo&display=swap" rel="stylesheet">
2024

2125
{% if site.head_scripts %}
2226
{% for script in site.head_scripts %}

_sass/minimal-mistakes/_variables.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
Typography
77
========================================================================== */
88

9-
// Importing Cardo from Google Fonts or another source
10-
@import url('https://fonts.googleapis.com/css2?family=Cardo&display=swap');
9+
// Cardo font is loaded via a <link> tag in the site head
1110

1211
$doc-font-size: 16 !default;
1312

assets/js/main.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"homepage": "https://mmistakes.github.io/minimal-mistakes/",
2121
"engines": {
22-
"node": ">= 0.10.0"
22+
"node": ">= 18"
2323
},
2424
"devDependencies": {
2525
"npm-run-all": "^4.1.5",

0 commit comments

Comments
 (0)