Merge pull request #14583 from nextcloud/remove-g+-federation

MorrisJobke · web-flow · commit 3f8235da6268 · 2019-03-08T09:04:01.000+01:00
Remove Google+ federation usersettings
diff --git a/apps/federatedfilesharing/css/settings-personal.scss b/apps/federatedfilesharing/css/settings-personal.scss
@@ -33,6 +33,3 @@
 .social-facebook {
 	@include icon-color('social-facebook', 'federatedfilesharing', $color-black);
 }
-.social-googleplus {
-	@include icon-color('social-googleplus', 'federatedfilesharing', $color-black);
-}
diff --git a/apps/federatedfilesharing/img/social-googleplus.svg b/apps/federatedfilesharing/img/social-googleplus.svg
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
@@ -28,10 +28,6 @@
 				data-url='https://twitter.com/intent/tweet?text=<?php p(urlencode($_['message_with_URL'])); ?>'>
 				Twitter
 			</button>
-			<button class="social-googleplus pop-up"
-				data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'>
-				Google+
-			</button>
 			<button class="social-diaspora pop-up"
 					data-url='https://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'>
 				Diaspora

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,3 @@`
`33`	`33`	`.social-facebook {`
`34`	`34`	`@include icon-color('social-facebook', 'federatedfilesharing', $color-black);`
`35`	`35`	`}`
`36`		`-.social-googleplus {`
`37`		`- @include icon-color('social-googleplus', 'federatedfilesharing', $color-black);`
`38`		`-}`