Merge branch 'develop' of https://github.com/frappe/frappe into custom-reports-develop

frappe/config/desktop.py

@@ -98,16 +98,5 @@ def get_data():
 			'standard': 1,
 			'idx': 15,
 			"description": "Build your profile and share posts with other users."
-		},
-		{
-			"module_name": 'leaderboard',
-			"category": "Places",
-			"label": _('Leaderboard'),
-			"icon": "octicon octicon-list-ordered",
-			"type": "link",
-			"link": "#social/users",
-			"color": '#FF4136',
-			'standard': 1,
-			'idx': 16
-		},
+		}
 	]

frappe/public/js/frappe/social/components/PostSidebar.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="flex flex-column">
-		<a class="route-link"
+		<a class="leaderboard-link"
 			@click.prevent="go_to_user_list()">
 			{{ __('Leaderboard') }}
 		</a>
@@ -56,6 +56,10 @@ export default {
 	margin: 0px 10px 10px 0;
 	text-transform: capitalize;
 }
+.leaderboard-link {
+	.route-link;
+	margin-bottom: 15px;
+}
 .stats {
 	min-height: 150px
 }

frappe/public/less/social.less

@@ -41,7 +41,7 @@ body[data-route*="social"] {
 			padding: 15px;
 			flex: 25%;
 			.event {
-				margin: 15px 0;
+				margin-bottom: 15px;
 			}
 		}
 	}
@@ -141,7 +141,7 @@ body[data-route*="social"] {
 
 	.muted-title {
 		&:extend(.text-muted);
-		margin-bottom: 15px;
+		margin-bottom: 10px;
 		text-transform: uppercase;
 		font-size: 10px;
 		font-weight: 600;