Merge branch 'release/4.2.0' into develop

kkunapuli · Jan 24, 2017 · 9bc0cc5 · 9bc0cc5
2 parents a903741 + 004d171
commit 9bc0cc5
Show file tree

Hide file tree

Showing 23 changed files with 267 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [4.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.0)
+
+### Enhancements
+
+- Add `video` helper (for YouTube/Vimeo) and video headers to `single`, `archive`, and `splash` layouts. [#788](https://github.com/mmistakes/minimal-mistakes/pull/788)
+- Add missing simplified Chinese localized UI text strings. [#747](https://github.com/mmistakes/minimal-mistakes/pull/747)
+- Add Nepali (Nepalese) localized UI text strings. [#785](https://github.com/mmistakes/minimal-mistakes/pull/785)
+- Remove borders from table elements found in Google Custom Search Engine widget. [#759](https://github.com/mmistakes/minimal-mistakes/issues/759)
+
+### Bug Fixes
+
+- Remove `position: sticky` JavaScript polyfill and fallback to default positioning for browsers that don't support it. [#752](https://github.com/mmistakes/minimal-mistakes/issues/752)
+
+### Maintenance
+
+- Fix invalid Google Universal Analytics example in documentation. [#783](https://github.com/mmistakes/minimal-mistakes/pull/783)
+- Bump `jekyll-sitemap` gem dependency to (1.0).
+
 ## [4.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.1.1)
 
 ### Enhancements

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ See what's new in the [CHANGELOG](CHANGELOG.md).
 - Optional [header images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#headers), [custom sidebars](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#sidebars), [table of contents](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#table-of-contents), [galleries](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery), related posts, [breadcrumb links](https://mmistakes.github.io/minimal-mistakes/docs/configuration/#breadcrumb-navigation-beta), [navigation lists](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list), and more.
 - Commenting support (powered by [Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), static-based via [Staticman](https://staticman.net/), and custom).
 - [Google Analytics](https://www.google.com/analytics/) support.
-- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Spanish, and Turkish
+- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Nepali (Nepalese), Spanish, and Turkish
 
 ## Demo Pages
 

diff --git a/_includes/page__hero_video.html b/_includes/page__hero_video.html
@@ -1,4 +1,4 @@
 {% capture video_id %}{{ page.header.video.id }}{% endcapture %}
 {% capture video_provider %}{{ page.header.video.provider }}{% endcapture %}
 
-{% include responsive_video id=video_id provider=video_provider %}
+{% include video id=video_id provider=video_provider %}
diff --git a/_includes/responsive_video → _includes/video b/_includes/responsive_video → _includes/video
diff --git a/_layouts/archive.html b/_layouts/archive.html
@@ -4,6 +4,8 @@
 
 {% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
   {% include page__hero.html %}
+{% elsif page.header.video.id and page.header.video.provider %}
+  {% include page__hero_video.html %}
 {% endif %}
 
 {% if page.url != "/" and site.breadcrumbs %}

diff --git a/_layouts/splash.html b/_layouts/splash.html
@@ -4,6 +4,8 @@
 
 {% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
   {% include page__hero.html %}
+{% elsif page.header.video.id and page.header.video.provider %}
+  {% include page__hero_video.html %}
 {% endif %}
 
 <div id="main" role="main">

diff --git a/_sass/_utilities.scss b/_sass/_utilities.scss
@@ -487,6 +487,7 @@ a.reversefootnote {
 
 .responsive-video-container {
   position: relative;
+  margin-bottom: 1em;
   padding-bottom: 56.25%;
   height: 0;
   overflow: hidden;

diff --git a/docs/_data/ui-text.yml b/docs/_data/ui-text.yml
@@ -411,6 +411,47 @@ de-LI:
   <<: *DEFAULT_DE
 de-LU:
   <<: *DEFAULT_DE
-
+# Nepali (Nepal)
+# -----------------
+ne: &DEFAULT_NE
+  page                       : "पृष्‍ठ"
+  pagination_previous        : "अघिल्लो"
+  pagination_next            : "अर्को"
+  breadcrumb_home_label      : "गृह"
+  breadcrumb_separator       : "/"
+  menu_label                 : "टगल मेनु"
+  toc_label                  : "यो पृष्‍ठमा"
+  ext_link_label             : "सिधा सम्पर्क"
+  less_than                  : "कम्तिमा"
+  minute_read                : "मिनेट पढ्नुहोस्"
+  share_on_label             : "शेयर गर्नुहोस्"
+  meta_label                 :
+  tags_label                 : "ट्यागहरू:"
+  categories_label           : "वर्गहरु:"
+  date_label                 : "अद्यावधिक:"
+  comments_label             : "टिप्पणी दिनुहोस्"
+  comments_title             : "टिप्पणीहरू"
+  more_label                 : "अझै सिक्नुहोस्"
+  related_label              : "तपाईं रुचाउन सक्नुहुन्छ "
+  follow_label               : "पछ्याउनुहोस्:"
+  feed_label                 : "फिड"
+  powered_by                 : "Powered by"
+  website_label              : "वेबसाइट"
+  email_label                : "इमेल"
+  recent_posts               : "ताजा लेखहरु"
+  undefined_wpm              : "अपरिभाषित प्यारामिटर शब्दहरू_प्रति_मिनेट at _config.yml"
+  comment_form_info          : "तपाइँको इमेल ठेगाना प्रकाशित गरिने छैन।आवश्यक जानकारीहरुमा चिन्ह लगाइको छ"
+  comment_form_comment_label : "टिप्पणी"
+  comment_form_md_info       : "मार्कडाउन  समर्थित छ।"
+  comment_form_name_label    : "नाम"
+  comment_form_email_label   : "इमेल ठेगाना"
+  comment_form_website_label : "वेबसाइट (वैकल्पिक)"
+  comment_btn_submit         : "टिप्पणी दिनुहोस् "
+  comment_btn_submitted      : "टिप्पणी भयो"
+  comment_success_msg        : "तपाईंको टिप्पणीको लागि धन्यवाद! एक पटक यो अनुमोदन गरेपछी यो साइटमा देखाउनेछ।"
+  comment_error_msg          : "माफ गर्नुहोस्, तपाईंको टिप्पणी त्रुटि थियो।सबै आवश्यक जानकारीहरु पूरा गरिएको छ भने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"
+  loading_label              : "लोड हुँदैछ ..."
+ne-NP:
+  <<: *DEFAULT_NE
 # Another locale
 # --------------
diff --git a/docs/_docs/08-ui-text.md b/docs/_docs/08-ui-text.md
@@ -14,6 +14,7 @@ Currently the English[^yaml-anchors] main keys in [`_data/ui-text.yml`](https://
 - French (Français)
 - German (Deutsch)
 - Italian (Italiano)
+- Nepali (Nepalese)
 - Spanish (Español)
 - Turkish (Türkçe)
 

diff --git a/docs/_docs/14-helpers.md b/docs/_docs/14-helpers.md
@@ -189,15 +189,52 @@ And then drop-in the feature row include in the body where you'd like it to appe
 **More Feature Row Goodness:** A [few more examples]({{ "/splash-page/" | absolute_url }}) and [source code](https://github.com/{{ site.repository }}/blob/master/docs/_pages/splash-page.md) can be seen in the demo site.
 {: .notice--info}
 
-## Video
+## Responsive Video Embed
 
-Embed a responsive video from YouTube or Vimeo.
+Embed a video from YouTube or Vimeo that responsively sizes to fit the width of its parent.
+
+| Parameter  | Required     | Description |
+|----------  |---------     | ----------- |
+| `id`       | **Required** | ID of the video |
+| `provider` | **Required** | Hosting provider of the video, either `youtube` or `vimeo` |
+
+### YouTube
+
+To embed the following YouTube video at url `https://www.youtube.com/watch?v=XsxDH4HcOWA` (long version) or `https://youtu.be/XsxDH4HcOWA` (short version) into a post or page's main content you'd use: 
 
 ```liquid
-{% raw %}{% include responsive_video id="97649261" provider="vimeo" %}{% endraw %}
+{% raw %}{% include video id="XsxDH4HcOWA" provider="youtube" %}{% endraw %}
 ```
 
-{% include responsive_video id="97649261" provider="vimeo" %}
+{% include video id="XsxDH4HcOWA" provider="youtube" %}
+
+To embed it as a video header you'd use the following YAML Front Matter
+
+```yaml
+header:
+  video:
+    id: XsxDH4HcOWA
+    provider: youtube
+```
+
+### Vimeo
+
+To embed the following Vimeo video at url `https://vimeo.com/97649261` into a post or page's main content you'd use: 
+
+```liquid
+{% raw %}{% include video id="97649261" provider="vimeo" %}{% endraw %}
+```
+
+{% include video id="97649261" provider="vimeo" %}
+
+To embed it as a video header you'd use the following YAML Front Matter
+
+```yaml
+header:
+  video:
+    id: 97649261
+    provider: vimeo
+```
 
 ## Table of Contents
 

diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md
@@ -4,9 +4,27 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-modified: 2016-12-21T23:04:51-05:00
+modified: 2017-01-24T10:10:17-05:00
 ---
 
+## [4.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.0)
+
+### Enhancements
+
+- Add `video` helper (for YouTube/Vimeo) and video headers to `single`, `archive`, and `splash` layouts. [#788](https://github.com/mmistakes/minimal-mistakes/pull/788)
+- Add missing simplified Chinese localized UI text strings. [#747](https://github.com/mmistakes/minimal-mistakes/pull/747)
+- Add Nepali (Nepalese) localized UI text strings. [#785](https://github.com/mmistakes/minimal-mistakes/pull/785)
+- Remove borders from table elements found in Google Custom Search Engine widget. [#759](https://github.com/mmistakes/minimal-mistakes/issues/759)
+
+### Bug Fixes
+
+- Remove `position: sticky` JavaScript polyfill and fallback to default positioning for browsers that don't support it. [#752](https://github.com/mmistakes/minimal-mistakes/issues/752)
+
+### Maintenance
+
+- Fix invalid Google Universal Analytics example in documentation. [#783](https://github.com/mmistakes/minimal-mistakes/pull/783)
+- Bump `jekyll-sitemap` gem dependency to (1.0).
+
 ## [4.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.1.1)
 
 ### Enhancements

diff --git a/docs/_includes/page__hero_video.html b/docs/_includes/page__hero_video.html
@@ -1,4 +1,4 @@
 {% capture video_id %}{{ page.header.video.id }}{% endcapture %}
 {% capture video_provider %}{{ page.header.video.provider }}{% endcapture %}
 
-{% include responsive_video id=video_id provider=video_provider %}
+{% include video id=video_id provider=video_provider %}
diff --git a/docs/_includes/responsive_video → docs/_includes/video b/docs/_includes/responsive_video → docs/_includes/video
diff --git a/docs/_layouts/archive.html b/docs/_layouts/archive.html
@@ -4,6 +4,8 @@
 
 {% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
   {% include page__hero.html %}
+{% elsif page.header.video.id and page.header.video.provider %}
+  {% include page__hero_video.html %}
 {% endif %}
 
 {% if page.url != "/" and site.breadcrumbs %}

diff --git a/docs/_layouts/splash.html b/docs/_layouts/splash.html
@@ -4,6 +4,8 @@
 
 {% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
   {% include page__hero.html %}
+{% elsif page.header.video.id and page.header.video.provider %}
+  {% include page__hero_video.html %}
 {% endif %}
 
 <div id="main" role="main">

diff --git a/docs/_pages/about.md b/docs/_pages/about.md
@@ -12,7 +12,7 @@ layouts_gallery:
   - url: /assets/images/mm-layout-archive.png
     image_path: /assets/images/mm-layout-archive.png
     alt: "archive layout example"
-modified: 2017-01-05T11:46:07-05:00
+modified: 2017-01-24T09:40:33-05:00
 ---
 
 Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your personal site, blog, or portfolio on GitHub or self-hosting on your own server. As the name implies --- styling is purposely minimalistic to be enhanced and customized by you :smile:.
@@ -30,7 +30,7 @@ Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your
 - Optional [header images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#headers), [custom sidebars](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#sidebars), [table of contents](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#table-of-contents), [galleries](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery), related posts, [breadcrumb links](https://mmistakes.github.io/minimal-mistakes/docs/configuration/#breadcrumb-navigation-beta), [navigation lists](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list), and more.
 - Commenting support (powered by [Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), static-based via [Staticman](https://staticman.net/), and custom).
 - [Google Analytics](https://www.google.com/analytics/) support.
-- UI localized text in English (default), Brazilian Portguese, Chinese, French, German, Italian, Spanish, and Turkish
+- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Nepali (Nepalese), Spanish, and Turkish
 
 ## Demo Pages
 

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.1.1">Latest release v4.1.1</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.2.0">Latest release v4.2.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/_posts/2017-01-23-layout-header-video.md b/docs/_posts/2017-01-23-layout-header-video.md
@@ -12,20 +12,26 @@ tags:
   - layout
 ---
 
-This post should display a **header with a reponsive video**, if the theme supports it.
+This post should display a **header with a responsive video**, if the theme supports it.
 
 ## Settings
 
-|---
-| Parameter | Required | Description |
-|-|-
-| `id` | **Required** | ID of the video
-| `provider` | **Required** | Hosting provider of the video, either 'youtube' or 'vimeo'
-|---
+| Parameter  | Required     | Description |
+|----------  |---------     | ----------- |
+| `id`       | **Required** | ID of the video |
+| `provider` | **Required** | Hosting provider of the video, either `youtube` or `vimeo` |
 
-## YouTube
+### YouTube
 
-Here is a YouTube example for the video at url `https://www.youtube.com/watch?v=XsxDH4HcOWA` (long version) or `https://youtu.be/XsxDH4HcOWA` (short version):
+To embed the following YouTube video at url `https://www.youtube.com/watch?v=XsxDH4HcOWA` (long version) or `https://youtu.be/XsxDH4HcOWA` (short version) into a post or page's main content you'd use: 
+
+```liquid
+{% raw %}{% include video id="XsxDH4HcOWA" provider="youtube" %}{% endraw %}
+```
+
+{% include video id="XsxDH4HcOWA" provider="youtube" %}
+
+To embed it as a video header you'd use the following YAML Front Matter
 
 ```yaml
 header:
@@ -34,18 +40,21 @@ header:
     provider: youtube
 ```
 
-{% include responsive_video id="XsxDH4HcOWA" provider="youtube" %}
+### Vimeo
+
+To embed the following Vimeo video at url `https://vimeo.com/97649261` into a post or page's main content you'd use: 
 
-## Vimeo
+```liquid
+{% raw %}{% include video id="97649261" provider="vimeo" %}{% endraw %}
+```
+
+{% include video id="97649261" provider="vimeo" %}
 
-Here is a Vimeo example for the video at url `https://vimeo.com/97649261`:
+To embed it as a video header you'd use the following YAML Front Matter
 
 ```yaml
 header:
   video:
     id: 97649261
     provider: vimeo
-```
-
-{% include responsive_video id="97649261" provider="vimeo" %}
-
+```
diff --git a/docs/_sass/_utilities.scss b/docs/_sass/_utilities.scss
@@ -487,6 +487,7 @@ a.reversefootnote {
 
 .responsive-video-container {
   position: relative;
+  margin-bottom: 1em;
   padding-bottom: 56.25%;
   height: 0;
   overflow: hidden;

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.1.1"
+  spec.version                 = "4.2.0"
   spec.authors                 = ["Michael Rose"]
 
   spec.summary                 = %q{A flexible two-column Jekyll theme.}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll", "~> 3.3"
   spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
-  spec.add_runtime_dependency "jekyll-sitemap", "~> 0.12"
+  spec.add_runtime_dependency "jekyll-sitemap", "~> 1.0"
   spec.add_runtime_dependency "jekyll-gist", "~> 1.4"
   spec.add_runtime_dependency "jekyll-feed", "~> 0.8"
   spec.add_runtime_dependency "jemoji", "~> 0.7"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",