From 05cbeaff529fa4b419ad066db50fd5b03618760a Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Wed, 6 Mar 2013 23:36:42 +0000
Subject: [PATCH] Twenty Thirteen: minor tweaks and fixes, props obenland.
 Fixes #23698.

 * Add 1px to top margin for second level menus to align child menus with parent height
 * Remove text-decoration on hover for cancel-comment-reply-link
 * Pull floated images only in post content
 * Close edit link span element correctly

git-svn-id: http://core.svn.wordpress.org/trunk@23629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentythirteen/functions.php       |  2 +-
 wp-content/themes/twentythirteen/style.css    | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index 7a3cd118c5..b3280fe8bf 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -356,7 +356,7 @@ function twentythirteen_comment( $comment, $args, $depth ) {
 						get_comment_time( 'c' ),
 						sprintf( _x( '%1$s at %2$s', '1: date, 2: time', 'twentythirteen' ), get_comment_date(), get_comment_time() )
 					);
-					edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '<span>' );
+					edit_comment_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
 				?>
 			</header><!-- .comment-meta -->
 
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index 8c96b3e36d..8841fae11f 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -715,19 +715,19 @@ video {
 }
 
 img.alignleft {
-	margin: 5px 20px 5px -60px;
+	margin: 5px 20px 5px 0;
 }
 
 .wp-caption.alignleft {
-	margin: 5px 10px 5px -60px;
+	margin: 5px 10px 5px 0;
 }
 
 img.alignright {
-	margin: 5px -60px 5px 20px;
+	margin: 5px 0 5px 20px;
 }
 
 .wp-caption.alignright {
-	margin: 5px -60px 5px 10px;
+	margin: 5px 0 5px 10px;
 }
 
 img.aligncenter {
@@ -877,7 +877,7 @@ div.nav-menu > ul {
 	float: left;
 	padding: 0;
 	position: absolute;
-	top: 44px;
+	top: 45px;
 	left: -2px;
 	z-index: 99999;
 }
@@ -1168,6 +1168,16 @@ ul.nav-menu li:hover > ul,
 	font-size: 16px;
 }
 
+.entry-content img.alignleft,
+.entry-content .wp-caption.alignleft {
+	margin-left: -60px;
+}
+
+.entry-content img.alignright,
+.entry-content .wp-caption.alignright {
+	margin-right: -60px;
+}
+
 footer.entry-meta {
 	margin-top: 24px;
 }
@@ -2323,6 +2333,7 @@ footer.entry-meta {
 
 #reply-title small a:hover {
 	color: #ed331c;
+	text-decoration: none;
 }
 
 #reply-title small a:before {