Skip to content

Commit 36428a1

Browse files
committed
Merge branch 'master' into feat/reserve_branche
2 parents 0b6794b + f8c1de8 commit 36428a1

File tree

4 files changed

+30
-16
lines changed

4 files changed

+30
-16
lines changed

README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ Install the Python dependencies listed in `requirements.txt` with:
2121
pip install -r requirements.txt
2222
```
2323

24+
To work with the JavaScript that powers the theme you'll also need Node
25+
dependencies. Install them with:
26+
27+
```bash
28+
npm install
29+
```
30+
31+
Bundled JavaScript is compiled from the source files in `assets/js/`. Run the
32+
following to create `main.min.js` (minified with a banner) or watch for changes:
33+
34+
```bash
35+
npm run build:js # minify and add banner
36+
npm run watch:js # optional: automatically rebuild on changes
37+
```
38+
2439
# ToDo
2540

2641
Have a consistency in the font and font sizes (ideally you want to use 2 fonts. One for the header/subtitle and one for the text. You can use this kind of website https://fontjoy.com/ which allow you to pair fonts).

_sass/minimal-mistakes/_variables.scss

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,6 @@ $base0d: #82aaff !default;
144144
$base0e: #c792ea !default;
145145
$base0f: #ff5370 !default;
146146

147-
/* Remove underline and set color to black */
148-
a {
149-
text-decoration: none;
150-
color: black;
151-
}
152-
153-
/* Add style on hover */
154-
a:hover {
155-
text-decoration: underline;
156-
color: #333333; // Dark gray
157-
}
158-
159-
160147
/*
161148
Breakpoints
162149
========================================================================== */

assets/css/main.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ search: false
88
@import "minimal-mistakes/skins/{{ site.minimal_mistakes_skin | default: 'default' }}"; // skin
99
@import "minimal-mistakes"; // main partials
1010

11+
/* Remove underline and set color to black */
12+
a {
13+
text-decoration: none;
14+
color: black;
15+
}
16+
17+
/* Add style on hover */
18+
a:hover {
19+
text-decoration: underline;
20+
color: #333333; // Dark gray
21+
}
22+
1123

1224
/* Custom styles for the 404 page */
1325
.page__hero {
@@ -66,4 +78,4 @@ search: false
6678

6779
.page__hero-button {
6880
margin-top: 1px; /* Add some space between the content and the button */
69-
}
81+
}

banner.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require("fs");
22
const pkg = require("./package.json");
33
const filename = "assets/js/main.min.js";
4-
const script = fs.readFileSync(filename);
4+
const script = fs.readFileSync(filename, 'utf8');
55
const padStart = str => ("0" + str).slice(-2);
66
const dateObj = new Date();
77
const date = `${dateObj.getFullYear()}-${padStart(
@@ -14,6 +14,6 @@ const banner = `/*!
1414
*/
1515
`;
1616

17-
if (script.slice(0, 3) != "/**") {
17+
if (!script.startsWith('/*!')) {
1818
fs.writeFileSync(filename, banner + script);
1919
}

0 commit comments

Comments
 (0)