Index: wp-content/themes/twentytwelve/content-image.php
===================================================================
--- wp-content/themes/twentytwelve/content-image.php	(revision 21670)
+++ wp-content/themes/twentytwelve/content-image.php	(working copy)
@@ -15,6 +15,6 @@
 
 		<footer class="entry-meta">
 			<h1><a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-			<h2><?php echo get_the_date(); ?></h2>
+			<h2><?php echo get_the_date(); edit_post_link( __( 'Edit', 'twentytwelve' ), ', <span class="edit-link">', '</span>' ); ?></h2>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post -->
Index: wp-content/themes/twentytwelve/content-link.php
===================================================================
--- wp-content/themes/twentytwelve/content-link.php	(revision 21670)
+++ wp-content/themes/twentytwelve/content-link.php	(working copy)
@@ -15,7 +15,7 @@
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
-			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a><?php
+			edit_post_link( __( 'Edit', 'twentytwelve' ), ', <span class="edit-link">', '</span>' ); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post -->
Index: wp-content/themes/twentytwelve/style.css
===================================================================
--- wp-content/themes/twentytwelve/style.css	(revision 21670)
+++ wp-content/themes/twentytwelve/style.css	(working copy)
@@ -880,10 +880,6 @@
 	line-height: 1.846153846;
 	color: #777;
 }
-footer .edit-link {
-	margin: 24px 0;
-	margin: 1.714285714rem 0;
-}
 
 
 /* =Archives
Index: wp-content/themes/twentytwelve/content-aside.php
===================================================================
--- wp-content/themes/twentytwelve/content-aside.php	(revision 21670)
+++ wp-content/themes/twentytwelve/content-aside.php	(working copy)
@@ -17,7 +17,7 @@
 	</div><!-- .aside -->
 
 	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
-		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a><?php
+		edit_post_link( __( 'Edit', 'twentytwelve' ), ', <span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->
Index: wp-content/themes/twentytwelve/content-quote.php
===================================================================
--- wp-content/themes/twentytwelve/content-quote.php	(revision 21670)
+++ wp-content/themes/twentytwelve/content-quote.php	(working copy)
@@ -14,7 +14,7 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
-		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a><?php
+		edit_post_link( __( 'Edit', 'twentytwelve' ), ', <span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->