diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe3c6e99401b..6b99af6db71d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [4.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.1)
+
+### Enhancements
+
+- Improve `paginator.html` to support paginated pages that live inside of a subfolder. See [documentation](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#home-page) for more details. [#764](https://github.com/mmistakes/minimal-mistakes/pull/764/)
+
+### Maintenance
+
+- Add `https` protocol to Google Universal Analytics embed. [#772](https://github.com/mmistakes/minimal-mistakes/pull/772)
+
## [4.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.0)
### Enhancements
diff --git a/_includes/analytics-providers/google-universal.html b/_includes/analytics-providers/google-universal.html
index 3ada6e36cae5..10d65b2ee488 100644
--- a/_includes/analytics-providers/google-universal.html
+++ b/_includes/analytics-providers/google-universal.html
@@ -2,8 +2,8 @@
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
ga('send', 'pageview');
-
\ No newline at end of file
+
diff --git a/_includes/page__hero.html b/_includes/page__hero.html
index ecc8d8056ad2..24488932ae5f 100644
--- a/_includes/page__hero.html
+++ b/_includes/page__hero.html
@@ -28,7 +28,7 @@
{% if page.header.overlay_color or page.header.overlay_image %}
- {% if paginator %}
+ {% if paginator and site.paginate_show_page_num %}
{{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
{% else %}
{{ page.title | default: site.title | markdownify | remove: "
" | remove: "
" }}
@@ -50,4 +50,4 @@
{% if page.header.caption %}
{{ page.header.caption | markdownify | remove: "" | remove: "
" }}
{% endif %}
-
\ No newline at end of file
+
diff --git a/_includes/paginator.html b/_includes/paginator.html
index b6bf99a2e05a..3cf71d82c0ed 100644
--- a/_includes/paginator.html
+++ b/_includes/paginator.html
@@ -1,22 +1,23 @@
{% if paginator.total_pages > 1 %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md
index 2409d61b0d0b..a8b60ced04d2 100644
--- a/docs/_docs/10-layouts.md
+++ b/docs/_docs/10-layouts.md
@@ -7,7 +7,7 @@ single_layout_gallery:
alt: "single layout with header example"
- image_path: /assets/images/mm-layout-single-meta.png
alt: "single layout with comments and related posts"
-modified: 2016-12-12T15:20:20-05:00
+modified: 2017-01-24T10:52:47-05:00
---
{% include toc icon="columns" title="Included Layouts" %}
@@ -183,6 +183,16 @@ paginate: 5 # amount of posts to show
paginate_path: /page:num/
```
+If you'd rather have a paginated page of posts reside in a subfolder instead of acting as your homepage make the following adjustments.
+
+Create `index.html` in the location you'd like. For example if I wanted it to live at **/blog** I'd create `/blog/index.html` with `layout: home` in its YAML Front Matter.
+
+Then adjust the `paginate_path` in **_config.yml** to match.
+
+```yaml
+paginate_path: /blog/page:num
+```
+
**Note:** Jekyll can only paginate a single `index.html` file. If you'd like to paginate more pages (e.g. category indexes) you'll need the help of a custom plugin. For more pagination related settings check the [**Configuration**]({{ "/docs/configuration/#paginate" | absolute_url }}) section.
{: .notice--info}
diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
index 15cb52879878..e380c49afb81 100644
--- a/docs/_docs/18-history.md
+++ b/docs/_docs/18-history.md
@@ -4,9 +4,19 @@ permalink: /docs/history/
excerpt: "Change log of enhancements and bug fixes made to the theme."
sidebar:
nav: docs
-modified: 2017-01-24T10:10:17-05:00
+modified: 2017-01-24T10:55:37-05:00
---
+## [4.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.1)
+
+### Enhancements
+
+- Improve `paginator.html` to support paginated pages that live inside of a subfolder. See [documentation](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#home-page) for more details. [#764](https://github.com/mmistakes/minimal-mistakes/pull/764/)
+
+### Maintenance
+
+- Add `https` protocol to Google Universal Analytics embed. [#772](https://github.com/mmistakes/minimal-mistakes/pull/772)
+
## [4.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.0)
### Enhancements
diff --git a/docs/_includes/analytics-providers/google-universal.html b/docs/_includes/analytics-providers/google-universal.html
index 3ada6e36cae5..10d65b2ee488 100644
--- a/docs/_includes/analytics-providers/google-universal.html
+++ b/docs/_includes/analytics-providers/google-universal.html
@@ -2,8 +2,8 @@
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
ga('send', 'pageview');
-
\ No newline at end of file
+
diff --git a/docs/_includes/page__hero.html b/docs/_includes/page__hero.html
index ecc8d8056ad2..24488932ae5f 100644
--- a/docs/_includes/page__hero.html
+++ b/docs/_includes/page__hero.html
@@ -28,7 +28,7 @@
{% if page.header.overlay_color or page.header.overlay_image %}
- {% if paginator %}
+ {% if paginator and site.paginate_show_page_num %}
{{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}
{% else %}
{{ page.title | default: site.title | markdownify | remove: "
" | remove: "
" }}
@@ -50,4 +50,4 @@
{% if page.header.caption %}
{{ page.header.caption | markdownify | remove: "" | remove: "
" }}
{% endif %}
-
\ No newline at end of file
+
diff --git a/docs/_includes/paginator.html b/docs/_includes/paginator.html
index b6bf99a2e05a..3cf71d82c0ed 100644
--- a/docs/_includes/paginator.html
+++ b/docs/_includes/paginator.html
@@ -1,22 +1,23 @@
{% if paginator.total_pages > 1 %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/docs/_pages/home.md b/docs/_pages/home.md
index e40d8e49783f..96b1b15ebea7 100644
--- a/docs/_pages/home.md
+++ b/docs/_pages/home.md
@@ -7,7 +7,7 @@ header:
cta_label: " 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.
Latest release v4.2.0
{::nomarkdown} {:/nomarkdown}'
+excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.2.1
{::nomarkdown} {:/nomarkdown}'
feature_row:
- image_path: /assets/images/mm-customizable-feature.png
alt: "customizable"
diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec
index 462d0e9b8319..49e71e77af02 100644
--- 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.0"
+ spec.version = "4.2.1"
spec.authors = ["Michael Rose"]
spec.summary = %q{A flexible two-column Jekyll theme.}
diff --git a/package.json b/package.json
index 834b417a9416..4edb24a7d14e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
- "version": "4.2.0",
+ "version": "4.2.1",
"description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": {
"type": "git",