Minor Jetpack sharing changes

inc/jetpack.php

@@ -124,7 +124,7 @@ function siteorigin_unwind_infinite_scroll_render() {
 }
 
 /**
- * Remove sharing buttons from their default locations
+ * Remove sharing buttons from their default locations.
  */
  function siteorigin_unwind_remove_share() {
     remove_filter( 'the_content', 'sharing_display', 19 );
@@ -137,7 +137,7 @@ function siteorigin_unwind_remove_share() {
 
 if ( ! function_exists( 'siteorigin_unwind_jetpack_related_projects' ) ) :
 /**
- * Displays jetpack related posts for projects
+ * Displays jetpack related posts for projects.
  */
 function siteorigin_unwind_jetpack_related_projects( $allowed_post_types ) {
 	$allowed_post_type[] = 'jetpack-portfolio';

sass/modules/_jetpack.scss

@@ -110,3 +110,20 @@
 		}
 	}
 }
+
+/*--------------------------------------------------------------
+## Sharing
+--------------------------------------------------------------*/
+.share-this {
+	font-size: 13px;
+}
+
+.single .sharedaddy .sd-content {
+	padding: 1em 0 1.5em;
+	text-align: center;
+	width: 100%;
+
+	ul {
+		display: inline-block;
+	}
+}

sass/site/header/_masthead.scss

@@ -152,7 +152,7 @@
 				float: left;
 
 				&:last-of-type {
-					margin-right: 0 !important;
+					margin-right: 0;
 				}
 
 				@media (max-width: 768px) {

sass/site/primary/_posts-and-pages.scss

@@ -810,23 +810,6 @@
 	}
 }
 
-/*--------------------------------------------------------------
-## Jetpack Sharing
---------------------------------------------------------------*/
-.share-this {
-	font-size: 13px;
-}
-
-.single .sharedaddy .sd-content {
-	padding: 1em 0 1.5em;
-	text-align: center;
-	width: 100%;
-
-	ul {
-		display: inline-block;
-	}
-}
-
 /*--------------------------------------------------------------
 ## Related Posts
 --------------------------------------------------------------*/

single.php

@@ -25,10 +25,14 @@
 				get_template_part( 'template-parts/content', 'single' );
 			}
 
-			if ( class_exists( 'Jetpack' ) && Jetpack::is_module_active( 'sharedaddy'  ) && function_exists( 'sharing_display' ) ) : ?>
-				<h2 class="share-this heading-strike"><?php esc_html_e( 'Share This', 'siteorigin-unwind' ); ?></h2>
-				<?php echo sharing_display();
-			endif;
+			if ( class_exists( 'Jetpack_Likes' ) ) {
+				$custom_likes = new Jetpack_Likes;
+				echo $custom_likes->post_likes();
+			}			
+
+			if ( class_exists( 'Jetpack' ) && Jetpack::is_module_active( 'sharedaddy' ) ) {
+				echo sharing_display();
+			}
 
 			if ( siteorigin_setting( 'navigation_post' ) ) :
 				siteorigin_unwind_the_post_navigation();