Skip to content

Commit 6b8d314

Browse files
mmistakesmmistakes
committed
Merge branch 'release/4.3.0'
2 parents 4454e39 + 7316be4 commit 6b8d314

14 files changed

+79
-11
lines changed

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0)
2+
3+
### Enhancements
4+
5+
- Add workaround to allow theme gem's `/assets/js/main.min.js` file to be overridden by a local version. Simply add the following YAML Front Matter to the file:
6+
7+
```
8+
---
9+
layout:
10+
---
11+
```
12+
13+
Any local customizations you make to `/assets/js/main.min.js` should now replace the theme gem's version.
14+
115
## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
216

317
### Enhancements

‎_includes/seo.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<meta name="author" content="{{ seo_author }}">
4343

44-
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
44+
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
4545
<meta property="og:site_name" content="{{ site.title }}">
4646
<meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
4747

‎assets/css/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33

44
/*!
5-
* Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
5+
* Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose
66
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
77
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
88
*/

‎assets/js/main.min.js

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎banner.js

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const fs = require('fs');
2+
const pkg = require('./package.json');
3+
const filename = 'assets/js/main.min.js';
4+
const script = fs.readFileSync(filename);
5+
const padStart = str => ('0' + str).slice(-2)
6+
const dateObj = new Date;
7+
const date = `${dateObj.getFullYear()}-${padStart(dateObj.getMonth() + 1)}-${padStart(dateObj.getDate())}`;
8+
const banner = `---
9+
layout:
10+
---
11+
12+
/*!
13+
* Minimal Mistakes Jekyll Theme ${pkg.version} by ${pkg.author}
14+
* Copyright ${dateObj.getFullYear()} Michael Rose - mademistakes.com | @mmistakes
15+
* Licensed under ${pkg.license}
16+
*/
17+
`;
18+
19+
if (script.slice(0, 3) != '/**') {
20+
fs.writeFileSync(filename, banner + script);
21+
}

‎docs/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ defaults:
195195
related: true
196196
# _pages
197197
- scope:
198-
path: ""
198+
path: "_pages"
199199
type: pages
200200
values:
201201
layout: single

‎docs/_docs/18-history.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,23 @@ permalink: /docs/history/
44
excerpt: "Change log of enhancements and bug fixes made to the theme."
55
sidebar:
66
nav: docs
7-
modified: 2017-02-21T10:35:32-05:00
7+
modified: 2017-02-28T10:35:04-05:00
88
---
99

10+
## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0)
11+
12+
### Enhancements
13+
14+
- Add workaround to allow theme gem's `/assets/js/main.min.js` file to be overridden by a local version. Simply add the following YAML Front Matter to the file:
15+
16+
```
17+
---
18+
layout:
19+
---
20+
```
21+
22+
Any local customizations you make to `/assets/js/main.min.js` should now replace the theme gem's version.
23+
1024
## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
1125

1226
### Enhancements

‎docs/_includes/seo.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<meta name="author" content="{{ seo_author }}">
4343

44-
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
44+
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
4545
<meta property="og:site_name" content="{{ site.title }}">
4646
<meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
4747

‎docs/_pages/home.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ header:
77
cta_label: "<i class='fa fa-download'></i> Install Now"
88
cta_url: "/docs/quick-start-guide/"
99
caption:
10-
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2">Latest release v4.2.2</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
10+
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0">Latest release v4.3.0</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
1111
feature_row:
1212
- image_path: /assets/images/mm-customizable-feature.png
1313
alt: "customizable"

‎docs/assets/css/main.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33

44
/*!
5-
* Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
5+
* Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose
66
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
77
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
88
*/

‎docs/assets/js/main.min.js

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎minimal-mistakes-jekyll.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "minimal-mistakes-jekyll"
5-
spec.version = "4.2.2"
5+
spec.version = "4.3.0"
66
spec.authors = ["Michael Rose"]
77

88
spec.summary = %q{A flexible two-column Jekyll theme.}

‎package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "minimal-mistakes",
3-
"version": "4.2.2",
3+
"version": "4.3.0",
44
"description": "Minimal Mistakes Jekyll theme npm build scripts",
55
"repository": {
66
"type": "git",
@@ -27,7 +27,8 @@
2727
},
2828
"scripts": {
2929
"uglify": "uglifyjs assets/js/vendor/jquery/jquery-1.12.4.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
30+
"add-banner": "node banner.js",
3031
"watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
31-
"build:js": "npm run uglify"
32+
"build:js": "npm run uglify && npm run add-banner"
3233
}
3334
}

‎test/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ defaults:
258258
related: true
259259
# _pages
260260
- scope:
261-
path: ""
261+
path: "_pages"
262262
type: pages
263263
values:
264264
layout: single

0 commit comments

Comments
 (0)