Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php	(revision 5120)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php	(working copy)
@@ -31,7 +31,7 @@
 		'forum-wp4-style',
 		get_template_directory_uri() . '/style.css',
 		array( 'bb-base' ),
-		'20170308'
+		'20170308a'
 	);
 
 	wp_style_add_data( 'forum-wp4-style', 'rtl', 'replace' );
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss	(revision 5120)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss	(working copy)
@@ -3,7 +3,7 @@
 /* Many of these override the styles from the plugin */
 
 section {
-	padding: 4rem 0;
+	padding: 2rem 0;
 }
 
 #bbpress-forums {
@@ -59,7 +59,6 @@
 			}
 
 			@media (min-width: $ms-breakpoint) {
-				height: 200px;
 				border-bottom: none;
 				margin: 2rem 5% 0 0;
 
@@ -630,7 +629,7 @@
 	}
 
 	.themes-plugins {
-		margin: 0 0 4rem;
+		margin: 0 0 2rem;
 		border-bottom: 1px solid #eee;
 
 		p {
@@ -650,7 +649,7 @@
 
 		@media (min-width: $ms-breakpoint) {
 			width: 65%;
-			margin: 3rem 0 4rem;
+			margin: 2rem 0;
 			border-bottom: none;
 
 			p {
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/typography/_headings.scss
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/typography/_headings.scss	(revision 5120)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/typography/_headings.scss	(working copy)
@@ -7,7 +7,6 @@
 	// Override wp4.css.
 	font-family: inherit;
 	line-height: $font__line-height-body;
-	margin: 2rem 0 1rem;
 }
 
 h1 {
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style-rtl.css
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style-rtl.css	(revision 5120)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style-rtl.css	(working copy)
@@ -530,7 +530,6 @@
 	clear: both;
 	font-family: inherit;
 	line-height: 1.5;
-	margin: 2rem 0 1rem;
 }
 
 h1 {
@@ -2494,7 +2493,7 @@
 /* bbPress specific styles */
 /* Many of these override the styles from the plugin */
 section {
-	padding: 4rem 0;
+	padding: 2rem 0;
 }
 
 #bbpress-forums {
@@ -2546,7 +2545,6 @@
 
 @media (min-width: 48em) {
 	.three-up.bbp-forums > div {
-		height: 200px;
 		border-bottom: none;
 		margin: 2rem 0 0 5%;
 	}
@@ -3086,7 +3084,7 @@
 }
 
 .home.wporg-support .themes-plugins {
-	margin: 0 0 4rem;
+	margin: 0 0 2rem;
 	border-bottom: 1px solid #eee;
 }
 
@@ -3108,7 +3106,7 @@
 @media (min-width: 48em) {
 	.home.wporg-support .themes-plugins {
 		width: 65%;
-		margin: 3rem 0 4rem;
+		margin: 2rem 0;
 		border-bottom: none;
 	}
 	.home.wporg-support .themes-plugins p {
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style.css
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style.css	(revision 5120)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style.css	(working copy)
@@ -530,7 +530,6 @@
 	clear: both;
 	font-family: inherit;
 	line-height: 1.5;
-	margin: 2rem 0 1rem;
 }
 
 h1 {
@@ -2496,7 +2495,7 @@
 /* bbPress specific styles */
 /* Many of these override the styles from the plugin */
 section {
-	padding: 4rem 0;
+	padding: 2rem 0;
 }
 
 #bbpress-forums {
@@ -2548,7 +2547,6 @@
 
 @media (min-width: 48em) {
 	.three-up.bbp-forums > div {
-		height: 200px;
 		border-bottom: none;
 		margin: 2rem 5% 0 0;
 	}
@@ -3088,7 +3086,7 @@
 }
 
 .home.wporg-support .themes-plugins {
-	margin: 0 0 4rem;
+	margin: 0 0 2rem;
 	border-bottom: 1px solid #eee;
 }
 
@@ -3110,7 +3108,7 @@
 @media (min-width: 48em) {
 	.home.wporg-support .themes-plugins {
 		width: 65%;
-		margin: 3rem 0 4rem;
+		margin: 2rem 0;
 		border-bottom: none;
 	}
 	.home.wporg-support .themes-plugins p {