Skip to content

Commit

Permalink
Merge pull request #4064 from consul/remove_google_plus
Browse files Browse the repository at this point in the history
Remove Google plus share button
  • Loading branch information
javierm committed Jul 21, 2020
2 parents 7ee3eec + e353954 commit 54095d7
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 68 deletions.
1 change: 0 additions & 1 deletion app/assets/fonts/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions app/assets/stylesheets/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@
content: "\f39e";
}

.icon-google-plus::before {
content: "\f0d5";
}

.icon-search::before {
content: "\f002";
}
Expand Down Expand Up @@ -286,7 +282,6 @@

.icon-blog,
.icon-facebook,
.icon-google-plus,
.icon-instagram,
.icon-telegram,
.icon-twitter,
Expand Down
51 changes: 0 additions & 51 deletions app/assets/stylesheets/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 1 addition & 6 deletions app/assets/stylesheets/participation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1244,10 +1243,6 @@
color: #354f88;
}

&[class^="social-share-button-google"] {
color: #ce3e26;
}

&.social-share-button-telegram:hover {
color: #ce3e26;
}
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/social_share_button.rb
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion config/locales/en/social_share_button.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion config/locales/es/social_share_button.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion spec/system/debates_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
expect(page.html).to include "<title>#{debate.title}</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

Expand Down
2 changes: 1 addition & 1 deletion spec/system/proposals_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
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

Expand Down

0 comments on commit 54095d7

Please sign in to comment.