From 59111d1e01c6465c79327f134bd7b663ef1c61be Mon Sep 17 00:00:00 2001
From: Michael Rose <est.michael@gmail.com>
Date: Tue, 5 Mar 2019 18:53:30 -0500
Subject: [PATCH] Remove Google+

Google+ is being shutdown on April 2, 2019. Social sharing buttong, comment provider, and author link configs have been removed from the theme.

ref: https://support.google.com/plus/answer/9195133
---
 _config.yml                                   |  2 +-
 _includes/author-profile.html                 |  8 -------
 _includes/comments-providers/google-plus.html |  2 --
 _includes/comments-providers/scripts.html     |  2 --
 _includes/comments.html                       | 15 ------------
 _includes/social-share.html                   |  2 --
 _sass/minimal-mistakes/_buttons.scss          |  1 -
 _sass/minimal-mistakes/_utilities.scss        |  6 -----
 _sass/minimal-mistakes/_variables.scss        |  1 -
 docs/_config.yml                              |  2 +-
 docs/_data/authors.yml                        | 24 +++++++++++++------
 docs/_docs/05-configuration.md                |  3 +--
 docs/_docs/10-layouts.md                      |  7 +++---
 docs/_pages/about.md                          |  2 +-
 test/_config.yml                              |  2 +-
 15 files changed, 25 insertions(+), 54 deletions(-)
 delete mode 100644 _includes/comments-providers/google-plus.html

diff --git a/_config.yml b/_config.yml
index 689c38af..05932211 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,7 +29,7 @@ masthead_title           : # overrides the website title displayed in the masthe
 # breadcrumbs            : false # true, false (default)
 words_per_minute         : 200
 comments:
-  provider               : # false (default), "disqus", "discourse", "facebook", "google-plus", "staticman", "staticman_v2", "utterances", "custom"
+  provider               : # false (default), "disqus", "discourse", "facebook", "staticman", "staticman_v2", "utterances", "custom"
   disqus:
     shortname            : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
   discourse:
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 8cbe1b66..4f0c02cd 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -97,14 +97,6 @@
         </li>
       {% endif %}
 
-      {% if author.google_plus %}
-        <li>
-          <a href="https://plus.google.com/{{ author.google_plus }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
-            <i class="fab fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+
-          </a>
-        </li>
-      {% endif %}
-
       {% if author.linkedin %}
         <li>
           <a href="https://www.linkedin.com/in/{{ author.linkedin }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
diff --git a/_includes/comments-providers/google-plus.html b/_includes/comments-providers/google-plus.html
deleted file mode 100644
index 0b4ff6b7..00000000
--- a/_includes/comments-providers/google-plus.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<script async type="text/javascript" src="//apis.google.com/js/plusone.js?callback=gpcb"></script>
-<noscript>Please enable JavaScript to view the <a href="https://plus.google.com/">comments powered by Google+.</a></noscript>
\ No newline at end of file
diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html
index ff9e31c2..4e3f5854 100644
--- a/_includes/comments-providers/scripts.html
+++ b/_includes/comments-providers/scripts.html
@@ -6,8 +6,6 @@
     {% 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 "staticman_v2" %}
diff --git a/_includes/comments.html b/_includes/comments.html
index 488e31f7..40b03597 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -10,21 +10,6 @@
     {% when "facebook" %}
       <h4 class="page__comments-title">{{ comments_label }}</h4>
       <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 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_v2" %}
       <section id="static-comments">
         {% if site.repository and site.staticman.branch %}
diff --git a/_includes/social-share.html b/_includes/social-share.html
index 10161aa0..0b377982 100644
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@@ -7,7 +7,5 @@
 
   <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}" class="btn btn--facebook" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Facebook"><i class="fab fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
 
-  <a href="https://plus.google.com/share?url={{ page.url | absolute_url | url_encode }}" class="btn btn--google-plus" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Google Plus"><i class="fab fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a>
-
   <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}" class="btn btn--linkedin" onclick="window.open(this.href, 'window', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0'); return false;" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} LinkedIn"><i class="fab fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
 </section>
diff --git a/_sass/minimal-mistakes/_buttons.scss b/_sass/minimal-mistakes/_buttons.scss
index e4394a19..9ef60a84 100644
--- a/_sass/minimal-mistakes/_buttons.scss
+++ b/_sass/minimal-mistakes/_buttons.scss
@@ -39,7 +39,6 @@
   (info, $info-color),
   (facebook, $facebook-color),
   (twitter, $twitter-color),
-  (google-plus, $google-plus-color),
   (linkedin, $linkedin-color);
 
   @each $buttoncolor, $color in $buttoncolors {
diff --git a/_sass/minimal-mistakes/_utilities.scss b/_sass/minimal-mistakes/_utilities.scss
index b15f6714..e569b601 100644
--- a/_sass/minimal-mistakes/_utilities.scss
+++ b/_sass/minimal-mistakes/_utilities.scss
@@ -228,12 +228,6 @@ body:hover .visually-hidden button {
     color: $gitlab-color;
   }
 
-  .fa-google-plus,
-  .fa-google-plus-square,
-  .fa-google-plus-g {
-    color: $google-plus-color;
-  }
-
   .fa-instagram {
     color: $instagram-color;
   }
diff --git a/_sass/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/_variables.scss
index e4b0661d..c3349d14 100644
--- a/_sass/minimal-mistakes/_variables.scss
+++ b/_sass/minimal-mistakes/_variables.scss
@@ -85,7 +85,6 @@ $flickr-color: #ff0084 !default;
 $foursquare-color: #0072b1 !default;
 $github-color: #171516 !default;
 $gitlab-color: #e24329 !default;
-$google-plus-color: #dd4b39 !default;
 $instagram-color: #517fa4 !default;
 $lastfm-color: #d51007 !default;
 $linkedin-color: #007bb6 !default;
diff --git a/docs/_config.yml b/docs/_config.yml
index 789452ce..1e8c3873 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -24,7 +24,7 @@ masthead_title           : # overrides the website title displayed in the masthe
 # breadcrumbs            : false # true, false (default)
 words_per_minute         : 200
 comments:
-  provider               : "false" # false (default), "disqus", "discourse", "facebook", "google-plus", "staticman_v2", "staticman", "utterances", "custom"
+  provider               : "false" # false (default), "disqus", "discourse", "facebook", "staticman_v2", "staticman", "utterances", "custom"
   disqus:
     shortname            :
   discourse:
diff --git a/docs/_data/authors.yml b/docs/_data/authors.yml
index d1ba8c62..256ee1fe 100644
--- a/docs/_data/authors.yml
+++ b/docs/_data/authors.yml
@@ -2,17 +2,27 @@
 
 Billy Rick:
   name        : "Billy Rick"
-  uri         : "http://thewhip.com"
-  email       : "billy@rick.com"
   bio         : "What do you want, jewels? I am a very extravagant man."
   avatar      : "/assets/images/bio-photo-2.jpg"
-  twitter     : "extravagantman"
-  google_plus : "BillyRick"
+  links:
+    - label: "Email"
+      icon: "fas fa-fw fa-envelope-square"
+      url: "mailto:billyrick@rick.com"
+    - label: "Website"
+      icon: "fas fa-fw fa-link"
+      url: "https://thewhip.com"
+    - label: "Twitter"
+      icon: "fab fa-fw fa-twitter-square"
+      url: "https://twitter.com/extravagantman"
 
 Cornelius Fiddlebone:
   name        : "Cornelius Fiddlebone"
-  email       : "cornelius@thewhip.com"
   bio         : "I ordered what?"
   avatar      : "/assets/images/bio-photo.jpg"
-  twitter     : "rhymeswithsackit"
-  google_plus : "CorneliusFiddlebone"
\ No newline at end of file
+  links:
+    - label: "Email"
+      icon: "fas fa-fw fa-envelope-square"
+      url: "mailto:cornelius@thewhip.com"
+    - label: "Twitter"
+      icon: "fab fa-fw fa-twitter-square"
+      url: "https://twitter.com/rhymeswithsackit"
\ No newline at end of file
diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md
index 49f94eec..3e4055dc 100644
--- a/docs/_docs/05-configuration.md
+++ b/docs/_docs/05-configuration.md
@@ -281,14 +281,13 @@ To disable reading time for a post, add `read_time: false` its YAML Front Matter
 
 ### Comments
 
-[**Disqus**](https://disqus.com/), [**Discourse**](https://www.discourse.org/), [**Facebook**](https://developers.facebook.com/docs/plugins/comments), **Google+**, [**utterances**](https://utteranc.es/), and static-based commenting via [**Staticman**](https://staticman.net/) are built into the theme. First set the comment provider you'd like to use:
+[**Disqus**](https://disqus.com/), [**Discourse**](https://www.discourse.org/), [**Facebook**](https://developers.facebook.com/docs/plugins/comments), [**utterances**](https://utteranc.es/), and static-based commenting via [**Staticman**](https://staticman.net/) are built into the theme. First set the comment provider you'd like to use:
 
 | Name             | Comment Provider          |
 | ---------------- | ------------------------- |
 | **disqus**       | Disqus                    |
 | **discourse**    | Discourse                 |
 | **facebook**     | Facebook Comments         |
-| **google-plus**  | Google+ Comments          |
 | **staticman_v2** | Staticman v2              |
 | **staticman**    | Staticman v1 (deprecated) |
 | **utterances**   | utterances                |
diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md
index 25ff4efa..49b15007 100644
--- a/docs/_docs/10-layouts.md
+++ b/docs/_docs/10-layouts.md
@@ -564,7 +564,7 @@ author:
       url: "https://instagram.com/mmistakes"
 ```
 
-**Note:** Depending on the icon and theme skin used, colors may not be used. Popular social networks like Twitter, Facebook, Instagram, Google+, etc. have the appropriate brand color set in CSS. To change or add missing colors edit [`_utilities.scss`](https://github.com/mmistakes/minimal-mistakes/blob/master/_sass/minimal-mistakes/_utilities.scss) in `<site root>/_sass/minimal-mistakes/`.
+**Note:** Depending on the icon and theme skin used, colors may not be used. Popular social networks like Twitter, Facebook, Instagram, etc. have the appropriate brand color set in CSS. To change or add missing colors edit [`_utilities.scss`](https://github.com/mmistakes/minimal-mistakes/blob/master/_sass/minimal-mistakes/_utilities.scss) in `<site root>/_sass/minimal-mistakes/`.
 {: .notice--info}
 
 For example, to color a Reddit icon, simply add a `color` declaration and the corresponding hex code like so:
@@ -701,7 +701,7 @@ defaults:
 
 ## Social sharing links
 
-The `single` layout has an option to enable social links at the bottom of posts for sharing on Twitter, Facebook, Google+, and LinkedIn. Similar to the links found in the author sidebar, the theme ships with defaults for the most common social networks.
+The `single` layout has an option to enable social links at the bottom of posts for sharing on Twitter, Facebook, and LinkedIn. Similar to the links found in the author sidebar, the theme ships with defaults for the most common social networks.
 
 ![default social share link buttons]({{ "/assets/images/mm-social-share-links-default.png" | relative_url }})
 
@@ -709,7 +709,7 @@ To enable these links add `share: true` to a post or page's YAML Front Matter or
 
 If you'd like to add, remove, or change the order of these default links you can do so by editing [`_includes/social-share.html`](https://github.com/mmistakes/minimal-mistakes/blob/master/_includes/social-share.html).
 
-Let's say you wanted to replace the Google+ button with a Reddit one. Simply replace the HTML with the following:
+Let's say you wanted to replace the LinkedIn button with a Reddit one. Simply replace the HTML with the following:
 
 ```html
 {% raw %}<a href="https://www.reddit.com/submit?url={{ page.url | absolute_url | url_encode }}&title={{ page.title }}" class="btn" title="{{ site.data.ui-text[site.locale].share_on_label }} Reddit"><i class="fab fa-fw fa-reddit" aria-hidden="true"></i><span> Reddit</span></a>{% endraw %}
@@ -732,7 +732,6 @@ Under the `$social` color map in `assets/_scss/_buttons.scss` simply add a name
 $social:
 (facebook, $facebook-color),
 (twitter, $twitter-color),
-(google-plus, $google-plus-color),
 (linkedin, $linkedin-color);
 (reddit, #ff4500;)
 ```
diff --git a/docs/_pages/about.md b/docs/_pages/about.md
index 2935a890..4e30067c 100644
--- a/docs/_pages/about.md
+++ b/docs/_pages/about.md
@@ -31,7 +31,7 @@ Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your
 - Several responsive layout options (single, archive index, search, splash, and paginated home page).
 - Optimized for search engines with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data
 - 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/), [utterances](https://utteranc.es/), static-based via [Staticman v1 and v2](https://staticman.net/), and custom).
+- Commenting support (powered by [Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), [Discourse](https://www.discourse.org/), [utterances](https://utteranc.es/), static-based via [Staticman v1 and v2](https://staticman.net/), and custom).
 - [Google Analytics](https://www.google.com/analytics/) support.
 - UI localized text in English (default), Brazilian Portuguese (Português brasileiro), Chinese, Danish, Dutch, French (Français), German (Deutsch), Greek, Hindi (हिंदी), Hungarian, Indonesian, Italian (Italiano), Japanese, Korean, Malayalam, Nepali (Nepalese), Persian (فارسی), Polish, Punjabi (ਪੰਜਾਬੀ), Romanian, Russian, Slovak, Spanish (Español), Swedish, Turkish (Türkçe), and Vietnamese.
 
diff --git a/test/_config.yml b/test/_config.yml
index dc3a0276..7ac3e8ad 100644
--- a/test/_config.yml
+++ b/test/_config.yml
@@ -23,7 +23,7 @@ masthead_title           : "Custom Title" # overrides the website title displaye
 # breadcrumbs            : false # true, false (default)
 words_per_minute         : 200
 comments:
-  provider               : # false (default), "disqus", "discourse", "facebook", "google-plus", "staticman", "utterances", "custom"
+  provider               : # false (default), "disqus", "discourse", "facebook", "staticman", "utterances", "custom"
   disqus:
     shortname            : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname-
   discourse: