From 8a930c93a8e91a0b6baadc38eb086b339d67e200 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Mon, 3 Nov 2014 21:49:44 +0000
Subject: [PATCH] Twenty Fifteen: Remove a gap between content and footer when
 the sidebar is longer than the content.

Props iamtakashi, fixes #30228.



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


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

diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css
index a21b1791cb..dbdd90e4cd 100644
--- a/wp-content/themes/twentyfifteen/rtl.css
+++ b/wp-content/themes/twentyfifteen/rtl.css
@@ -645,8 +645,8 @@ img.alignleft {
 	}
 
 	.site-footer {
-		margin-right: 35.2941%;
-		margin-left: auto;
+		float: right;
+		margin: 0 35.2941% 0 0;
 	}
 }
 
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index 605b049a04..3b5bd35dc7 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -1272,8 +1272,6 @@ img.aligncenter {
 .comment-content:after,
 .site-content:before,
 .site-content:after,
-.site-footer:before,
-.site-footer:after,
 .nav-links:before,
 .nav-links:after,
 .comment-navigation:before,
@@ -1291,7 +1289,6 @@ img.aligncenter {
 .entry-content:after,
 .comment-content:after,
 .site-content:after,
-.site-footer:after,
 .nav-links:after,
 .comment-navigation:after,
 .social-navigation ul:after,
@@ -4535,8 +4532,8 @@ span > video {
 	}
 
 	.site-footer {
-		clear: both;
-		margin-left: 35.2941%;
+		float: left;
+		margin: 0 0 0 35.2941%;
 		padding: 0;
 		width: 58.8235%;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ec9b0dd2a0..79a18d571a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30219';
+$wp_version = '4.1-alpha-30220';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.