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 5146)
+++ 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' ),
-		'20170310b'
+		'20170310c'
 	);
 
 	wp_style_add_data( 'forum-wp4-style', 'rtl', 'replace' );
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page-forums-sidebar.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page-forums-sidebar.php	(revision 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page-forums-sidebar.php	(nonexistent)
@@ -1,30 +0,0 @@
-<?php
-/**
- * Template Name: Page with a Forums Sidebar
- *
- * @package bbPress
- * @subpackage Theme
- */
-
-get_header(); ?>
-
-<main id="main" class="site-main" role="main">
-
-	<div class="entry-content">
-		<?php bbp_breadcrumb(); ?>
-
-		<?php while ( have_posts() ) : the_post(); ?>
-
-			<header class="page-header">
-				<h1 class="page-title"><?php the_title(); ?></h1>
-			</header><!-- .page-header -->
-
-			<?php the_content(); ?>
-
-		<?php endwhile; ?>
-	</div>
-
-	<?php get_sidebar(); ?>
-</main>
-
-<?php get_footer(); ?>

Property changes on: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page-forums-sidebar.php
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page.php	(revision 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/page.php	(working copy)
@@ -4,29 +4,24 @@
  *
  * This is the template that displays all pages by default.
  * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
+ * and that other 'pages' on your WordPress site may use a
  * different template.
  *
+ * @package WPBBP
  */
 
 get_header(); ?>
 
-<main id="main" class="site-main" role="main">
+	<main id="main" class="site-main" role="main">
 
-	<div class="entry-content">
-		<?php bbp_breadcrumb(); ?>
+		<?php
+		while ( have_posts() ) : the_post();
 
-		<?php while ( have_posts() ) : the_post(); ?>
+			get_template_part( 'template-parts/content', 'page' );
+		endwhile; // End of the loop.
+		?>
 
-			<header class="page-header">
-				<h1 class="page-title"><?php the_title(); ?></h1>
-			</header><!-- .page-header -->
+	</main><!-- #main -->
 
-			<?php the_content(); ?>
-
-		<?php endwhile; ?>
-	</div>
-
-</main>
-
-<?php get_footer(); ?>
+<?php
+get_footer();
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 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_bbpress.scss	(working copy)
@@ -73,6 +73,45 @@
 
 
 .bbpress {
+	main#main {
+		margin-top: 2rem;
+		padding: 0 10px 10px;
+
+		@extend .clear;
+
+		.entry-content,
+		.entry-meta {
+			padding: 0;
+
+			@media(min-width:568px) {
+				padding: 0 ms(4);
+			}
+		}
+
+		> .entry-content {
+			max-width: 48rem;
+
+			@media screen and ( min-width: $ms-breakpoint ) {
+				float: left;
+				padding: 0; 
+				width: 65%;
+			}
+		}
+
+		@media screen and ( min-width: $ms-breakpoint ) {
+			.entry-content,
+			.entry-meta {
+				padding-left: 0;
+				padding-right: 0;
+			}
+
+			.entry-meta {
+				float: right;
+				width: 30%;
+			}
+		}
+	}
+
 	#bbpress-forums {
 
 		div.bbp-template-notice {
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_site.scss
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_site.scss	(revision 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/site/_site.scss	(working copy)
@@ -5,50 +5,6 @@
 	font-size: ms(0);
 }
 
-main#main {
-	margin-top: 2rem;
-	padding: 0 10px 10px;
-	font-size: ms(-2);
-
-	@extend .clear;
-}
-
-.bbpress main#main,
-.page-template-page-forums-sidebar main#main {
-
-	.entry-content,
-	.entry-meta {
-		padding: 0;
-
-		@media(min-width:568px) {
-			padding: 0 ms(4);
-		}
-	}
-
-	> .entry-content {
-		max-width: 48rem;
-
-		@media screen and ( min-width: $ms-breakpoint ) {
-			float: left;
-			padding: 0; 
-			width: 65%;
-		}
-	}
-
-	@media screen and ( min-width: $ms-breakpoint ) {
-		.entry-content,
-		.entry-meta {
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		.entry-meta {
-			float: right;
-			width: 30%;
-		}
-	}
-}
-
 /*--------------------------------------------------------------
 # .site-header 
 --------------------------------------------------------------*/
@@ -307,8 +263,8 @@
 		}
 	}
 
-	.page & {
-		padding-top: 0;
+	#page & {
+		padding: 0 10px ms(10);
 	}
 
 	.page-header {
@@ -539,6 +495,35 @@
 			}
 		}
 	}
+
+	.submenu {
+		margin-left: 0;
+	}
+
+	.submenu li {
+		border-bottom: 1px solid #dedede;
+		font-size: 12px;
+		line-height: 18px;
+		padding: 5px 0;
+	}
+
+	.submenu li.current {
+		font-weight: bold;
+	}
+
+	.submenu li:last-child {
+		border-bottom: 0;
+	}
+
+	.submenu li ul {
+		margin-left: 16px;
+	}
+
+	.submenu li ul li {
+		border: none;
+		line-height: 1.4em;
+		padding-bottom: 2px;
+	}
 }
 
 
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 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style-rtl.css	(working copy)
@@ -1911,10 +1911,10 @@
 /*--------------------------------------------------------------
 # Clearings
 --------------------------------------------------------------*/
-.clear:before, main#main:before, .three-up:before, .bbp-view .review-ratings:before,
+.clear:before, .three-up:before, .bbpress main#main:before, .bbp-view .review-ratings:before,
 .clear:after,
-main#main:after,
 .three-up:after,
+.bbpress main#main:after,
 .bbp-view .review-ratings:after,
 .entry-content:before,
 .entry-content:after,
@@ -1931,7 +1931,7 @@
 	table-layout: fixed;
 }
 
-.clear:after, main#main:after, .three-up:after, .bbp-view .review-ratings:after,
+.clear:after, .three-up:after, .bbpress main#main:after, .bbp-view .review-ratings:after,
 .entry-content:after,
 .comment-content:after,
 .site-header:after,
@@ -2003,57 +2003,6 @@
 	font-size: 1rem;
 }
 
-main#main {
-	margin-top: 2rem;
-	padding: 0 10px 10px;
-	font-size: 0.8rem;
-}
-
-.bbpress main#main .entry-content,
-.bbpress main#main .entry-meta,
-.page-template-page-forums-sidebar main#main .entry-content,
-.page-template-page-forums-sidebar main#main .entry-meta {
-	padding: 0;
-}
-
-@media (min-width: 568px) {
-	.bbpress main#main .entry-content,
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-content,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		padding: 0 1.5625rem;
-	}
-}
-
-.bbpress main#main > .entry-content,
-.page-template-page-forums-sidebar main#main > .entry-content {
-	max-width: 48rem;
-}
-
-@media screen and (min-width: 48em) {
-	.bbpress main#main > .entry-content,
-	.page-template-page-forums-sidebar main#main > .entry-content {
-		float: right;
-		padding: 0;
-		width: 65%;
-	}
-}
-
-@media screen and (min-width: 48em) {
-	.bbpress main#main .entry-content,
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-content,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		padding-right: 0;
-		padding-left: 0;
-	}
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		float: left;
-		width: 30%;
-	}
-}
-
 /*--------------------------------------------------------------
 # .site-header 
 --------------------------------------------------------------*/
@@ -2296,8 +2245,8 @@
 	}
 }
 
-.page .site-main {
-	padding-top: 0;
+#page .site-main {
+	padding: 0 10px 3.0517578125rem;
 }
 
 .site-main .page-header h1 {
@@ -2516,6 +2465,35 @@
 	border-top: 2px solid #eee;
 }
 
+.page .submenu {
+	margin-right: 0;
+}
+
+.page .submenu li {
+	border-bottom: 1px solid #dedede;
+	font-size: 12px;
+	line-height: 18px;
+	padding: 5px 0;
+}
+
+.page .submenu li.current {
+	font-weight: bold;
+}
+
+.page .submenu li:last-child {
+	border-bottom: 0;
+}
+
+.page .submenu li ul {
+	margin-right: 16px;
+}
+
+.page .submenu li ul li {
+	border: none;
+	line-height: 1.4em;
+	padding-bottom: 2px;
+}
+
 /*--------------------------------------------------------------
 # 404 Error page
 --------------------------------------------------------------*/
@@ -2590,6 +2568,47 @@
 	}
 }
 
+.bbpress main#main {
+	margin-top: 2rem;
+	padding: 0 10px 10px;
+}
+
+.bbpress main#main .entry-content,
+.bbpress main#main .entry-meta {
+	padding: 0;
+}
+
+@media (min-width: 568px) {
+	.bbpress main#main .entry-content,
+	.bbpress main#main .entry-meta {
+		padding: 0 1.5625rem;
+	}
+}
+
+.bbpress main#main > .entry-content {
+	max-width: 48rem;
+}
+
+@media screen and (min-width: 48em) {
+	.bbpress main#main > .entry-content {
+		float: right;
+		padding: 0;
+		width: 65%;
+	}
+}
+
+@media screen and (min-width: 48em) {
+	.bbpress main#main .entry-content,
+	.bbpress main#main .entry-meta {
+		padding-right: 0;
+		padding-left: 0;
+	}
+	.bbpress main#main .entry-meta {
+		float: left;
+		width: 30%;
+	}
+}
+
 .bbpress #bbpress-forums div.bbp-template-notice {
 	padding: .5rem;
 	border: none;
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 5146)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/style.css	(working copy)
@@ -1913,10 +1913,10 @@
 /*--------------------------------------------------------------
 # Clearings
 --------------------------------------------------------------*/
-.clear:before, main#main:before, .three-up:before, .bbp-view .review-ratings:before,
+.clear:before, .three-up:before, .bbpress main#main:before, .bbp-view .review-ratings:before,
 .clear:after,
-main#main:after,
 .three-up:after,
+.bbpress main#main:after,
 .bbp-view .review-ratings:after,
 .entry-content:before,
 .entry-content:after,
@@ -1933,7 +1933,7 @@
 	table-layout: fixed;
 }
 
-.clear:after, main#main:after, .three-up:after, .bbp-view .review-ratings:after,
+.clear:after, .three-up:after, .bbpress main#main:after, .bbp-view .review-ratings:after,
 .entry-content:after,
 .comment-content:after,
 .site-header:after,
@@ -2005,57 +2005,6 @@
 	font-size: 1rem;
 }
 
-main#main {
-	margin-top: 2rem;
-	padding: 0 10px 10px;
-	font-size: 0.8rem;
-}
-
-.bbpress main#main .entry-content,
-.bbpress main#main .entry-meta,
-.page-template-page-forums-sidebar main#main .entry-content,
-.page-template-page-forums-sidebar main#main .entry-meta {
-	padding: 0;
-}
-
-@media (min-width: 568px) {
-	.bbpress main#main .entry-content,
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-content,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		padding: 0 1.5625rem;
-	}
-}
-
-.bbpress main#main > .entry-content,
-.page-template-page-forums-sidebar main#main > .entry-content {
-	max-width: 48rem;
-}
-
-@media screen and (min-width: 48em) {
-	.bbpress main#main > .entry-content,
-	.page-template-page-forums-sidebar main#main > .entry-content {
-		float: left;
-		padding: 0;
-		width: 65%;
-	}
-}
-
-@media screen and (min-width: 48em) {
-	.bbpress main#main .entry-content,
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-content,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		padding-left: 0;
-		padding-right: 0;
-	}
-	.bbpress main#main .entry-meta,
-	.page-template-page-forums-sidebar main#main .entry-meta {
-		float: right;
-		width: 30%;
-	}
-}
-
 /*--------------------------------------------------------------
 # .site-header 
 --------------------------------------------------------------*/
@@ -2298,8 +2247,8 @@
 	}
 }
 
-.page .site-main {
-	padding-top: 0;
+#page .site-main {
+	padding: 0 10px 3.0517578125rem;
 }
 
 .site-main .page-header h1 {
@@ -2518,6 +2467,35 @@
 	border-top: 2px solid #eee;
 }
 
+.page .submenu {
+	margin-left: 0;
+}
+
+.page .submenu li {
+	border-bottom: 1px solid #dedede;
+	font-size: 12px;
+	line-height: 18px;
+	padding: 5px 0;
+}
+
+.page .submenu li.current {
+	font-weight: bold;
+}
+
+.page .submenu li:last-child {
+	border-bottom: 0;
+}
+
+.page .submenu li ul {
+	margin-left: 16px;
+}
+
+.page .submenu li ul li {
+	border: none;
+	line-height: 1.4em;
+	padding-bottom: 2px;
+}
+
 /*--------------------------------------------------------------
 # 404 Error page
 --------------------------------------------------------------*/
@@ -2592,6 +2570,47 @@
 	}
 }
 
+.bbpress main#main {
+	margin-top: 2rem;
+	padding: 0 10px 10px;
+}
+
+.bbpress main#main .entry-content,
+.bbpress main#main .entry-meta {
+	padding: 0;
+}
+
+@media (min-width: 568px) {
+	.bbpress main#main .entry-content,
+	.bbpress main#main .entry-meta {
+		padding: 0 1.5625rem;
+	}
+}
+
+.bbpress main#main > .entry-content {
+	max-width: 48rem;
+}
+
+@media screen and (min-width: 48em) {
+	.bbpress main#main > .entry-content {
+		float: left;
+		padding: 0;
+		width: 65%;
+	}
+}
+
+@media screen and (min-width: 48em) {
+	.bbpress main#main .entry-content,
+	.bbpress main#main .entry-meta {
+		padding-left: 0;
+		padding-right: 0;
+	}
+	.bbpress main#main .entry-meta {
+		float: right;
+		width: 30%;
+	}
+}
+
 .bbpress #bbpress-forums div.bbp-template-notice {
 	padding: .5rem;
 	border: none;
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/content-page.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/content-page.php	(nonexistent)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/template-parts/content-page.php	(working copy)
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Template part for displaying page content in page.php.
+ *
+ * @link https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WPBBP
+ */
+
+?>
+
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<header class="entry-header">
+		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+	</header><!-- .entry-header -->
+
+	<div class="entry-content">
+		<section>
+			<div class="container">
+				<?php
+				the_content();
+
+				wp_link_pages( array(
+					'before' => '<div class="page-links">' . esc_html__( 'Pages:', 'wporg-plugins' ),
+					'after'  => '</div>',
+				) );
+				?>
+			</div>
+		</section>
+	</div><!-- .entry-content -->
+
+	<footer class="entry-footer">
+		<?php
+		edit_post_link(
+			sprintf(
+			/* translators: %s: Name of current post */
+				esc_html__( 'Edit %s', 'wporg-plugins' ),
+				the_title( '<span class="screen-reader-text">"', '"</span>', false )
+			),
+			'<span class="edit-link">',
+			'</span>'
+		);
+		?>
+	</footer><!-- .entry-footer -->
+</article><!-- #post-## -->
\ No newline at end of file