From 222240c4da48d1b6d14b51a3f926a64326cb491c Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Fri, 21 Oct 2016 20:51:53 +0000
Subject: [PATCH] Twenty Seventeen: Fix spacing issue on pages with comments

This effected the two column layout on pages. The entry content and comment areas needed to be floated and cleared properly.

Props laurelfulford.

Fixes #38388.

Built from https://develop.svn.wordpress.org/trunk@38866


git-svn-id: http://core.svn.wordpress.org/trunk@38809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyseventeen/rtl.css   | 3 ++-
 wp-content/themes/twentyseventeen/style.css | 4 +++-
 wp-includes/version.php                     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyseventeen/rtl.css b/wp-content/themes/twentyseventeen/rtl.css
index 37e3906a1a..b8b002801f 100644
--- a/wp-content/themes/twentyseventeen/rtl.css
+++ b/wp-content/themes/twentyseventeen/rtl.css
@@ -373,7 +373,8 @@ input[type="checkbox"] {
 	.search:not(.has-sidebar) #primary article,
 	.has-sidebar.error404 #primary .page-content,
 	.error404.has-sidebar #primary .page-content,
-	body.page-two-column #primary .entry-content {
+	body.page-two-column #primary .entry-content,
+	body.page-two-column #comments {
 		float: left;
 	}
 
diff --git a/wp-content/themes/twentyseventeen/style.css b/wp-content/themes/twentyseventeen/style.css
index 0b6764b426..a814f9ae20 100644
--- a/wp-content/themes/twentyseventeen/style.css
+++ b/wp-content/themes/twentyseventeen/style.css
@@ -2241,6 +2241,7 @@ body:not(.twentyseventeen-front-page) .entry-header {
 --------------------------------------------------------------*/
 
 #comments {
+	clear: both;
 	padding: 2em 0 0.5em;
 }
 
@@ -3669,7 +3670,8 @@ article.panel-placeholder {
 	.search:not(.has-sidebar) #primary article,
 	.error404:not(.has-sidebar) #primary .page-content,
 	.error404.has-sidebar #primary .page-content,
-	body.page-two-column #primary .entry-content {
+	body.page-two-column #primary .entry-content,
+	body.page-two-column #comments {
 		float: right;
 		width: 58%;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 42f9387231..698e5b71f7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38865';
+$wp_version = '4.7-alpha-38866';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.