Merge pull request #1526 from bc-williamkwon/deprecateGoogle

STRF-5665 remove google plus
bigcommerce · Jun 28, 2019 · c6e0958 · c6e0958
2 parents 0d295df + bf702a1
commit c6e0958
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Update @babel/polyfill to 7.4.4 [#1521](https://github.com/bigcommerce/cornerstone/pull/1521)
 - Add maxlength to text options [#1531](https://github.com/bigcommerce/cornerstone/pull/1531)
 - Add return instructions in return-saved.html [#1525](https://github.com/bigcommerce/cornerstone/pull/1525)
+- Remove Google Plus [#1526](https://github.com/bigcommerce/cornerstone/pull/1526)
 
 ## 3.5.1 (2019-06-24)
 - Fix conditional logic in share.html [#1522](https://github.com/bigcommerce/cornerstone/pull/1522)

diff --git a/assets/scss/components/stencil/socialLinks/_socialLinks.scss b/assets/scss/components/stencil/socialLinks/_socialLinks.scss
@@ -32,11 +32,6 @@
     }
 }
 
-// scss-lint:disable SelectorFormat
-.google_plusone_iframe_widget {
-    // scss-lint:disable ImportantRule
-    width: inherit !important;
-}
 // scss-lint:enable SelectorFormat
 
 // scss-lint:disable SelectorFormat

diff --git a/templates/components/amp/common/share.html b/templates/components/amp/common/share.html
@@ -3,11 +3,7 @@
         {{#each settings.add_this.buttons}}
             {{#all (if service '!==' 'google') (if service '!==' 'print') (if service '!==' 'facebook')}}
                 <li class="socialLinks-item socialLinks-item--{{service}}">
-                  {{#if service '===' 'google_plusone'}}
-                        <amp-social-share class="amp-social-share" data-vars-product-link="{{url}}" data-vars-product-id="{{id}}" data-vars-product-name="{{name}}" data-vars-social-type="gplus" type="gplus"></amp-social-share>
-                    {{else}}
-                        <amp-social-share class="amp-social-share" data-vars-product-link="{{url}}" data-vars-product-id="{{id}}" data-vars-product-name="{{name}}" data-vars-social-type="{{service}}" type="{{service}}"></amp-social-share>
-                  {{/if}}
+                    <amp-social-share class="amp-social-share" data-vars-product-link="{{url}}" data-vars-product-id="{{id}}" data-vars-product-name="{{name}}" data-vars-social-type="{{service}}" type="{{service}}"></amp-social-share>
                 </li>
             {{/all}}
         {{/each}}

diff --git a/templates/components/common/share.html b/templates/components/common/share.html
@@ -5,9 +5,7 @@
             {{#each settings.add_this.buttons}}
                 <li class="socialLinks-item socialLinks-item--{{service}}">
                     <a class="addthis_button_{{service}} icon icon--{{service}}" {{{annotation}}}>
-                        {{#if service '===' 'google_plusone'}}
-                            <!-- No custom icons allowed with g+ -->
-                        {{else if service '===' 'facebook'}}
+                        {{if service '===' 'facebook'}}
                             <svg>
                                 <use xlink:href="#icon-facebook"/>
                             </svg>

diff --git a/templates/components/common/social-links.html b/templates/components/common/social-links.html
@@ -2,15 +2,9 @@
     <ul class="socialLinks socialLinks--alt">
         {{#each social_media}}
             <li class="socialLinks-item">
-                {{#if display_name '===' 'google+'}}
-                    <a class="icon icon--google" href="{{url}}" target="_blank">
-                        <svg><use xlink:href="#icon-google" /></svg>
-                    </a>
-                {{else}}
-                    <a class="icon icon--{{display_name}}" href="{{url}}" target="_blank">
-                        <svg><use xlink:href="#icon-{{display_name}}" /></svg>
-                    </a>
-                {{/if}}
+                <a class="icon icon--{{display_name}}" href="{{url}}" target="_blank">
+                    <svg><use xlink:href="#icon-{{display_name}}" /></svg>
+                </a>
             </li>
         {{/each}}
     </ul>