From e3539544a8433050744a3fc6390be0c8281371f1 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 17 Jul 2020 13:18:39 +0200 Subject: [PATCH] Remove google plus share button --- app/assets/fonts/icons.svg | 1 - app/assets/stylesheets/icons.scss | 5 --- app/assets/stylesheets/layout.scss | 51 ---------------------- app/assets/stylesheets/participation.scss | 7 +-- config/initializers/social_share_button.rb | 2 +- config/locales/en/social_share_button.yml | 1 - config/locales/es/social_share_button.yml | 1 - spec/system/debates_spec.rb | 2 +- spec/system/proposals_spec.rb | 2 +- 9 files changed, 4 insertions(+), 68 deletions(-) diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 8cb96e997..dd2540a00 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -32,7 +32,6 @@ - diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 699220c67..5915164d2 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -122,10 +122,6 @@ content: "\f39e"; } -.icon-google-plus::before { - content: "\f0d5"; -} - .icon-search::before { content: "\f002"; } @@ -286,7 +282,6 @@ .icon-blog, .icon-facebook, -.icon-google-plus, .icon-instagram, .icon-telegram, .icon-twitter, diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 9eb5c734b..4177b9d3d 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1653,32 +1653,6 @@ table { } } -[class^="ssb-icon ssb-google"] { - background: #de4c34; - background-image: none !important; - color: #fff; - height: $line-height * 2 !important; - position: relative; - width: $line-height * 2 !important; - - &::before { - content: "B"; - font-family: "icons" !important; - font-size: rem-calc(24); - left: 50%; - line-height: $line-height * 2; - margin-left: rem-calc(-11); - position: absolute; - top: 0; - } - - &:hover, - &:focus { - background: #fff; - color: #ce3e26; - } -} - .button.button-wordpress { background: #dcdde3; border-left: 3px solid #2f2f33; @@ -1817,31 +1791,6 @@ table { } } - [class^="ssb-icon ssb-google"] { - background: #de4c34; - color: #fff; - height: rem-calc(24); - position: relative; - width: rem-calc(48); - - &::before { - content: "B"; - font-family: "icons" !important; - font-size: rem-calc(24); - left: 50%; - line-height: $line-height * 2; - margin-left: rem-calc(-11); - position: absolute; - top: 0; - } - - &:hover, - &:focus { - background: #fff; - color: #ce3e26; - } - } - .ssb-telegram { background: #08c; color: #fff; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 9748b3794..d1b1325ba 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1121,8 +1121,7 @@ .share-supported { .ssb-twitter, - .ssb-facebook, - [class^="ssb-icon ssb-google"] { + .ssb-facebook { background: none; color: $text; height: rem-calc(33) !important; @@ -1244,10 +1243,6 @@ color: #354f88; } - &[class^="social-share-button-google"] { - color: #ce3e26; - } - &.social-share-button-telegram:hover { color: #ce3e26; } diff --git a/config/initializers/social_share_button.rb b/config/initializers/social_share_button.rb index f28cd2933..48840aeac 100644 --- a/config/initializers/social_share_button.rb +++ b/config/initializers/social_share_button.rb @@ -1,3 +1,3 @@ SocialShareButton.configure do |config| - config.allow_sites = %w[twitter facebook google_plus telegram] + config.allow_sites = %w[twitter facebook telegram] end diff --git a/config/locales/en/social_share_button.yml b/config/locales/en/social_share_button.yml index b2aa209fd..dbc62e956 100644 --- a/config/locales/en/social_share_button.yml +++ b/config/locales/en/social_share_button.yml @@ -11,7 +11,6 @@ en: baidu: "Baidu.com" kaixin001: "Kaixin001.com" renren: "Renren.com" - google_plus: "Google+" google_bookmark: "Google Bookmark" tumblr: "Tumblr" plurk: "Plurk" diff --git a/config/locales/es/social_share_button.yml b/config/locales/es/social_share_button.yml index d624f0b0b..2947efcc6 100644 --- a/config/locales/es/social_share_button.yml +++ b/config/locales/es/social_share_button.yml @@ -11,7 +11,6 @@ es: baidu: "Baidu.com" kaixin001: "Kaixin001.com" renren: "Renren.com" - google_plus: "Google+" google_bookmark: "Google Bookmark" tumblr: "Tumblr" plurk: "Plurk" diff --git a/spec/system/debates_spec.rb b/spec/system/debates_spec.rb index 0c14302ae..216d29880 100644 --- a/spec/system/debates_spec.rb +++ b/spec/system/debates_spec.rb @@ -95,7 +95,7 @@ describe "Debates" do expect(page.html).to include "#{debate.title}" within(".social-share-button") do - expect(page.all("a").count).to be(4) # Twitter, Facebook, Google+, Telegram + expect(page.all("a").count).to be(3) # Twitter, Facebook, Telegram end end diff --git a/spec/system/proposals_spec.rb b/spec/system/proposals_spec.rb index 559bd27cb..6374057cf 100644 --- a/spec/system/proposals_spec.rb +++ b/spec/system/proposals_spec.rb @@ -140,7 +140,7 @@ describe "Proposals" do expect(page).not_to have_selector ".js-follow" within(".social-share-button") do - expect(page.all("a").count).to be(4) # Twitter, Facebook, Google+, Telegram + expect(page.all("a").count).to be(3) # Twitter, Facebook, Telegram end end