From ff872080bc66ab9374786f87ffa246465cdb9e25 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Mon, 20 Oct 2014 19:19:18 +0000
Subject: [PATCH] Twenty Fifteen: correct comment meta alignment when avatar
 display is turned off.

Props iamtakashi, fixes #30046.


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


git-svn-id: http://core.svn.wordpress.org/trunk@29720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/rtl.css   | 62 ++++-------------------
 wp-content/themes/twentyfifteen/style.css | 52 +++++--------------
 2 files changed, 22 insertions(+), 92 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css
index dfa69761e7..fd1d913d35 100644
--- a/wp-content/themes/twentyfifteen/rtl.css
+++ b/wp-content/themes/twentyfifteen/rtl.css
@@ -332,7 +332,8 @@ img.alignleft {
 }
 
 .comment-author .avatar {
-	margin-right: auto;
+	float: right;
+	margin-right: 0;
 	margin-left: 0.4em;
 }
 
@@ -487,19 +488,8 @@ img.alignleft {
 		padding-left: 0;
 	}
 
-	.comment-author {
-		padding-right: 4.1176em;
-		padding-left: 0;
-	}
-
 	.comment-author .avatar {
-		right: 0;
-		left: auto;
-	}
-
-	.comment-metadata {
-		padding-right: 5em;
-		padding-left: 0;
+		margin-left: 1.64705em;
 	}
 
 	.bypostauthor > article .fn:after {
@@ -566,14 +556,8 @@ img.alignleft {
 		padding-left: 0;
 	}
 
-	.comment-author {
-		padding-right: 4.6315em;
-		padding-left: 0;
-	}
-
-	.comment-metadata {
-		padding-right: 5.5em;
-		padding-left: 0;
+	.comment-author .avatar {
+		margin-left: 1.6842em;
 	}
 }
 
@@ -647,19 +631,8 @@ img.alignleft {
 		padding-left: 0;
 	}
 
-	.comment-author {
-		padding-right: 0;
-		padding-left: 0;
-	}
-
 	.comment-author .avatar {
-		margin-right: auto;
-		margin-left: 0.4em;
-	}
-
-	.comment-metadata {
-		padding-right: 0;
-		padding-left: 0;
+		margin-left: 0.8em;
 	}
 
 	.bypostauthor > article .fn:after {
@@ -728,25 +701,14 @@ img.alignleft {
 		padding-left: 0;
 	}
 
-	.comment-author {
-		padding-right: 4.1176em;
-		padding-left: 0;
-	}
-
 	.comment-author .avatar {
-		right: 0;
-		left: auto;
+		margin-left: 1.64705em;
 	}
 
 	.bypostauthor > article .fn:after {
 		right: 6px;
 		left: auto;
 	}
-
-	.comment-metadata {
-		padding-right: 5em;
-		padding-left: 0;
-	}
 }
 
 
@@ -800,14 +762,8 @@ img.alignleft {
 		padding-left: 0;
 	}
 
-	.comment-author {
-		padding-right: 4.6315em;
-		padding-left: 0;
-	}
-
-	.comment-metadata {
-		padding-right: 5.5em;
-		padding-left: 0;
+	.comment-author .avatar {
+		margin-left: 1.64705em;
 	}
 }
 
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index b6f95c5b21..50d1cec4b2 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -2137,8 +2137,9 @@ a.post-thumbnail:focus {
 
 .comment-author .avatar {
 	border-radius: 50%;
+	float: left;
 	height: 24px;
-	margin-right: 0.4em;
+	margin-right: 0.8em;
 	width: 24px;
 }
 
@@ -3210,22 +3211,16 @@ span > video {
 
 	.comment-author {
 		margin-bottom: 0;
-		padding-left: 4.1176em;
 	}
 
 	.comment-author .avatar {
 		height: 42px;
-		margin: 0;
-		position: absolute;
-		top: 3px;
-		left: 0;
+		margin-right: 1.64705em;
+		position: relative;
+		top: 5px;
 		width: 42px;
 	}
 
-	.comment-metadata {
-		padding-left: 5em;
-	}
-
 	.comment-metadata .edit-link a:before {
 		top: 2px;
 	}
@@ -3740,18 +3735,15 @@ span > video {
 		padding-left: 1.4737em;
 	}
 
-	.comment-author {
-		padding-left: 4.6315em;
-	}
-
 	.comment-author .avatar {
 		height: 56px;
+		margin-right: 1.6842em;
+		top: 3px;
 		width: 56px;
 	}
 
 	.comment-metadata {
 		line-height: 2;
-		padding-left: 5.5em;
 	}
 
 	.comment-metadata .edit-link a:before {
@@ -4408,20 +4400,15 @@ span > video {
 
 	.comment-author {
 		margin-bottom: 0.4em;
-		padding-left: 0;
 	}
 
 	.comment-author .avatar {
 		height: 24px;
-		margin-right: 0.4em;
-		position: static;
+		margin-right: 0.8em;
+		top: 0;
 		width: 24px;
 	}
 
-	.comment-metadata {
-		padding-left: 0;
-	}
-
 	.comment-metadata .edit-link a:before {
 		top: 3px;
 	}
@@ -4925,15 +4912,12 @@ span > video {
 
 	.comment-author {
 		margin-bottom: 0;
-		padding-left: 4.1176em;
 	}
 
 	.comment-author .avatar {
 		height: 42px;
-		margin: 0;
-		position: absolute;
-		top: 3px;
-		left: 0;
+		margin-right: 1.64705em;
+		top: 5px;
 		width: 42px;
 	}
 
@@ -4942,10 +4926,6 @@ span > video {
 		left: 6px;
 	}
 
-	.comment-metadata {
-		padding-left: 5em;
-	}
-
 	.comment-metadata .edit-link a:before {
 		top: 6px;
 	}
@@ -5441,12 +5421,10 @@ span > video {
 		padding-left: 1.4737em;
 	}
 
-	.comment-author {
-		padding-left: 4.6315em;
-	}
-
 	.comment-author .avatar {
 		height: 56px;
+		margin-right: 1.6842em;
+		top: 3px;
 		width: 56px;
 	}
 
@@ -5454,10 +5432,6 @@ span > video {
 		top: 8px;
 	}
 
-	.comment-metadata {
-		padding-left: 5.5em;
-	}
-
 	.comment-metadata .edit-link a:before {
 		top: 8px;
 	}