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

MorrisJobke · web-flow · commit be8a82ecbae7 · 2019-03-26T14:16:11.000+01:00
[stable15] Remove Google+ federation usersettings
diff --git a/apps/federatedfilesharing/css/settings-personal.css b/apps/federatedfilesharing/css/settings-personal.css
@@ -36,6 +36,3 @@
 .social-facebook {
 	background-image: url('../img/social-facebook.svg');
 }
-.social-googleplus {
-	background-image: url('../img/social-googleplus.svg');
-}
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
`@@ -36,6 +36,3 @@`
`36`	`36`	`.social-facebook {`
`37`	`37`	`background-image: url('../img/social-facebook.svg');`
`38`	`38`	`}`
`39`		`-.social-googleplus {`
`40`		`- background-image: url('../img/social-googleplus.svg');`
`41`		`-}`