Merge branch 'release/4.3.0'

mmistakes · Feb 28, 2017 · 6b8d314 · 6b8d314
2 parents 4454e39 + 7316be4
commit 6b8d314
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0)
+
+### Enhancements
+
+- 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:
+
+  ```
+  ---
+  layout: 
+  ---
+  ```
+
+  Any local customizations you make to `/assets/js/main.min.js` should now replace the theme gem's version.
+
 ## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
 
 ### Enhancements

diff --git a/_includes/seo.html b/_includes/seo.html
@@ -41,7 +41,7 @@
 
 <meta name="author" content="{{ seo_author }}">
 
-<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
+<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
 <meta property="og:site_name" content="{{ site.title }}">
 <meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
 

diff --git a/assets/css/main.scss b/assets/css/main.scss
@@ -2,7 +2,7 @@
 ---
 
 /*!
- * Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
+ * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose
  * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
  * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
 */

diff --git a/assets/js/main.min.js b/assets/js/main.min.js
diff --git a/banner.js b/banner.js
@@ -0,0 +1,21 @@
+const fs = require('fs');
+const pkg = require('./package.json');
+const filename = 'assets/js/main.min.js';
+const script = fs.readFileSync(filename);
+const padStart = str => ('0' + str).slice(-2)
+const dateObj = new Date;
+const date = `${dateObj.getFullYear()}-${padStart(dateObj.getMonth() + 1)}-${padStart(dateObj.getDate())}`;
+const banner = `---
+layout:
+---
+
+/*!
+ * Minimal Mistakes Jekyll Theme ${pkg.version} by ${pkg.author}
+ * Copyright ${dateObj.getFullYear()} Michael Rose - mademistakes.com | @mmistakes
+ * Licensed under ${pkg.license}
+ */
+`;
+
+if (script.slice(0, 3) != '/**') {
+  fs.writeFileSync(filename, banner + script);
+}
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -195,7 +195,7 @@ defaults:
       related: true
   # _pages
   - scope:
-      path: ""
+      path: "_pages"
       type: pages
     values:
       layout: single

diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
@@ -4,9 +4,23 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-modified: 2017-02-21T10:35:32-05:00
+modified: 2017-02-28T10:35:04-05:00
 ---
 
+## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0)
+
+### Enhancements
+
+- 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:
+
+  ```
+  ---
+  layout: 
+  ---
+  ```
+
+  Any local customizations you make to `/assets/js/main.min.js` should now replace the theme gem's version.
+
 ## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
 
 ### Enhancements

diff --git a/docs/_includes/seo.html b/docs/_includes/seo.html
@@ -41,7 +41,7 @@
 
 <meta name="author" content="{{ seo_author }}">
 
-<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
+<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
 <meta property="og:site_name" content="{{ site.title }}">
 <meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
 

diff --git a/docs/_pages/home.md b/docs/_pages/home.md
@@ -7,7 +7,7 @@ header:
   cta_label: "<i class='fa fa-download'></i> Install Now"
   cta_url: "/docs/quick-start-guide/"
   caption:
-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}'
+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}'
 feature_row:
   - image_path: /assets/images/mm-customizable-feature.png
     alt: "customizable"

diff --git a/docs/assets/css/main.scss b/docs/assets/css/main.scss
@@ -2,7 +2,7 @@
 ---
 
 /*!
- * Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
+ * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose
  * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
  * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
 */

diff --git a/docs/assets/js/main.min.js b/docs/assets/js/main.min.js
diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                    = "minimal-mistakes-jekyll"
-  spec.version                 = "4.2.2"
+  spec.version                 = "4.3.0"
   spec.authors                 = ["Michael Rose"]
 
   spec.summary                 = %q{A flexible two-column Jekyll theme.}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "4.2.2",
+  "version": "4.3.0",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",
@@ -27,7 +27,8 @@
   },
   "scripts": {
     "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",
+    "add-banner": "node banner.js",
     "watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
-    "build:js": "npm run uglify"
+    "build:js": "npm run uglify && npm run add-banner"
   }
 }
diff --git a/test/_config.yml b/test/_config.yml
@@ -258,7 +258,7 @@ defaults:
       related: true
   # _pages
   - scope:
-      path: ""
+      path: "_pages"
       type: pages
     values:
       layout: single