Merge branch 'zmsp-master'

CHANGELOG.md

@@ -9,6 +9,7 @@
 
 - Toggle close button on `mouseleave`. [#975](https://github.com/mmistakes/minimal-mistakes/issues/975)
 - Remove extraneous `</a>` and `</li>` tags from `paginator.html` include. [#1038](https://github.com/mmistakes/minimal-mistakes/pull/1038)
+- Fix Google+ comments provider includes. [#1092](https://github.com/mmistakes/minimal-mistakes/issues/1092)
 
 ### Maintenance
 

_includes/comments-providers/scripts.html

@@ -1,5 +1,4 @@
 {% if site.comments.provider and page.comments %}
-
   {% case site.comments.provider %}
     {% when "disqus" %}
       {% include /comments-providers/disqus.html %}
@@ -14,5 +13,4 @@
     {% when "custom" %}
       {% include /comments-providers/custom.html %}
   {% endcase %}
-
 {% endif %}

_includes/comments.html

@@ -12,7 +12,19 @@
         <section class="fb-comments" data-href="{{ page.url | absolute_url }}" data-mobile="true" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="100%" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
       {% when "google-plus" %}
         <h4 class="page__comments-title">{{ comments_label }}</h4>
-    <section class="g-comments" data-href="{{ page.url | absolute_url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
+        <section id="g-comments" class="g-comments">Loading Google+ Comments ...</section>
+        <script>
+          function initComment() {
+            gapi.comments.render("g-comments", {
+              href: "{{ page.url | absolute_url }}",
+              width: "624",
+              first_party_property: "BLOGGER",
+              view_type: "FILTERED_POSTMOD"
+            })
+          }
+        </script>
+        <script async type="text/javascript" src="https://apis.google.com/js/plusone.js" onload="initComment()" />
+        <noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>-->
       {% when "staticman" %}
         <section id="static-comments">
           {% if site.repository and site.staticman.branch %}

docs/_docs/18-history.md

@@ -4,7 +4,7 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-last_modified_at: 2017-05-30T08:13:43-04:00
+last_modified_at: 2017-07-05T12:09:11-04:00
 ---
 
 ## Unreleased
@@ -18,6 +18,7 @@ last_modified_at: 2017-05-30T08:13:43-04:00
 
 - Toggle close button on `mouseleave`. [#975](https://github.com/mmistakes/minimal-mistakes/issues/975)
 - Remove extraneous `</a>` and `</li>` tags from `paginator.html` include. [#1038](https://github.com/mmistakes/minimal-mistakes/pull/1038)
+- Fix Google+ comments provider includes. [#1092](https://github.com/mmistakes/minimal-mistakes/issues/1092)
 
 ### Maintenance
 

docs/_includes/comments-providers/scripts.html

@@ -1,5 +1,4 @@
 {% if site.comments.provider and page.comments %}
-
   {% case site.comments.provider %}
     {% when "disqus" %}
       {% include /comments-providers/disqus.html %}
@@ -14,5 +13,4 @@
     {% when "custom" %}
       {% include /comments-providers/custom.html %}
   {% endcase %}
-
 {% endif %}

docs/_includes/comments.html

@@ -12,7 +12,19 @@
         <section class="fb-comments" data-href="{{ page.url | absolute_url }}" data-mobile="true" data-num-posts="{{ site.comments.facebook.num_posts | default: 5 }}" data-width="100%" data-colorscheme="{{ site.comments.facebook.colorscheme | default: 'light' }}"></section>
       {% when "google-plus" %}
         <h4 class="page__comments-title">{{ comments_label }}</h4>
-    <section class="g-comments" data-href="{{ page.url | absolute_url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
+        <section id="g-comments" class="g-comments">Loading Google+ Comments ...</section>
+        <script>
+          function initComment() {
+            gapi.comments.render("g-comments", {
+              href: "{{ page.url | absolute_url }}",
+              width: "624",
+              first_party_property: "BLOGGER",
+              view_type: "FILTERED_POSTMOD"
+            })
+          }
+        </script>
+        <script async type="text/javascript" src="https://apis.google.com/js/plusone.js" onload="initComment()" />
+        <noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>-->
       {% when "staticman" %}
         <section id="static-comments">
           {% if site.repository and site.staticman.branch %}