diff --git a/CHANGELOG.md b/CHANGELOG.md index 28b16521..15b390b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Toggle close button on `mouseleave`. [#975](https://github.com/mmistakes/minimal-mistakes/issues/975) - Remove extraneous `` and `` 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 diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html index ed192f7e..1eb536f2 100644 --- a/_includes/comments-providers/scripts.html +++ b/_includes/comments-providers/scripts.html @@ -1,18 +1,16 @@ {% if site.comments.provider and page.comments %} - -{% case site.comments.provider %} -{% when "disqus" %} - {% include /comments-providers/disqus.html %} -{% when "discourse" %} - {% include /comments-providers/discourse.html %} -{% when "facebook" %} - {% include /comments-providers/facebook.html %} -{% when "google-plus" %} - {% include /comments-providers/google-plus.html %} -{% when "staticman" %} - {% include /comments-providers/staticman.html %} -{% when "custom" %} - {% include /comments-providers/custom.html %} -{% endcase %} - + {% case site.comments.provider %} + {% when "disqus" %} + {% include /comments-providers/disqus.html %} + {% when "discourse" %} + {% include /comments-providers/discourse.html %} + {% when "facebook" %} + {% include /comments-providers/facebook.html %} + {% when "google-plus" %} + {% include /comments-providers/google-plus.html %} + {% when "staticman" %} + {% include /comments-providers/staticman.html %} + {% when "custom" %} + {% include /comments-providers/custom.html %} + {% endcase %} {% endif %} \ No newline at end of file diff --git a/_includes/comments.html b/_includes/comments.html index ecf10272..6f57edc9 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,83 +1,95 @@
{% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %} - {% case site.comments.provider %} - {% when "discourse" %} -

{{ comments_label }}

-
- {% when "disqus" %} -

{{ comments_label }}

-
- {% when "facebook" %} -

{{ comments_label }}

-
- {% when "google-plus" %} -

{{ comments_label }}

-
Loading Google+ Comments ...
- {% when "staticman" %} -
- {% if site.repository and site.staticman.branch %} - -
- {% if site.data.comments[page.slug] %} -

{{ site.data.ui-text[site.locale].comments_title | default: "Comments" }}

- {% assign comments = site.data.comments[page.slug] | sort %} + {% case site.comments.provider %} + {% when "discourse" %} +

{{ comments_label }}

+
+ {% when "disqus" %} +

{{ comments_label }}

+
+ {% when "facebook" %} +

{{ comments_label }}

+
+ {% when "google-plus" %} +

{{ comments_label }}

+
Loading Google+ Comments ...
+ + +