From da61f07b482b37d65d74009d771b3f1044868020 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Mon, 9 May 2011 22:08:05 +0000
Subject: [PATCH] Twenty Eleven fixes, props matveb - see #17198

- Add padding to the menu when the search input is in menu bar
- Improve search input behavior when located in menu bar (also props ocean90)
- i18n for post formats headings (also props nickbohle)
- Small style fix for images

git-svn-id: https://develop.svn.wordpress.org/trunk@17845 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/twentyeleven/content-aside.php   | 2 +-
 wp-content/themes/twentyeleven/content-gallery.php | 2 +-
 wp-content/themes/twentyeleven/content-image.php   | 2 +-
 wp-content/themes/twentyeleven/content-link.php    | 2 +-
 wp-content/themes/twentyeleven/content-quote.php   | 2 +-
 wp-content/themes/twentyeleven/content-status.php  | 2 +-
 wp-content/themes/twentyeleven/style.css           | 8 +++++++-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/wp-content/themes/twentyeleven/content-aside.php b/wp-content/themes/twentyeleven/content-aside.php
index d3a8d96560..bebf58cd65 100644
--- a/wp-content/themes/twentyeleven/content-aside.php
+++ b/wp-content/themes/twentyeleven/content-aside.php
@@ -14,7 +14,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-				<h2 class="entry-format">Aside</h2>
+				<h2 class="entry-format"><?php _e( 'Aside', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
 			<?php if ( 'post' == $post->post_type ) : ?>
diff --git a/wp-content/themes/twentyeleven/content-gallery.php b/wp-content/themes/twentyeleven/content-gallery.php
index 51f27f6b63..7a704e5ff9 100644
--- a/wp-content/themes/twentyeleven/content-gallery.php
+++ b/wp-content/themes/twentyeleven/content-gallery.php
@@ -14,7 +14,7 @@
 	<header class="entry-header">
 		<hgroup>
 			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-			<h2 class="entry-format">Gallery</h2>
+			<h2 class="entry-format"><?php _e( 'Gallery', 'twentyeleven' ); ?></h2>
 		</hgroup>
 
 		<div class="entry-meta">
diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php
index fd97062f51..25f7bd5934 100644
--- a/wp-content/themes/twentyeleven/content-image.php
+++ b/wp-content/themes/twentyeleven/content-image.php
@@ -14,7 +14,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-				<h2 class="entry-format">Image</h2>
+				<h2 class="entry-format"><?php _e( 'Image', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
 			<?php if ( comments_open() ) : ?>
diff --git a/wp-content/themes/twentyeleven/content-link.php b/wp-content/themes/twentyeleven/content-link.php
index a58893941d..1560eeaeaa 100644
--- a/wp-content/themes/twentyeleven/content-link.php
+++ b/wp-content/themes/twentyeleven/content-link.php
@@ -14,7 +14,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-				<h2 class="entry-format">Link</h2>
+				<h2 class="entry-format"><?php _e( 'Link', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
 			<?php if ( 'post' == $post->post_type ) : ?>
diff --git a/wp-content/themes/twentyeleven/content-quote.php b/wp-content/themes/twentyeleven/content-quote.php
index 0a26b6052f..74714a3b76 100644
--- a/wp-content/themes/twentyeleven/content-quote.php
+++ b/wp-content/themes/twentyeleven/content-quote.php
@@ -12,7 +12,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-				<h2 class="entry-format">Quote</h2>
+				<h2 class="entry-format"><?php _e( 'Quote', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
 			<?php if ( 'post' == $post->post_type ) : ?>
diff --git a/wp-content/themes/twentyeleven/content-status.php b/wp-content/themes/twentyeleven/content-status.php
index 4a776d34c9..9c44496d8d 100644
--- a/wp-content/themes/twentyeleven/content-status.php
+++ b/wp-content/themes/twentyeleven/content-status.php
@@ -13,7 +13,7 @@
 		<header class="entry-header">
 			<hgroup>
 				<h1 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-				<h2 class="entry-format">Status</h2>
+				<h2 class="entry-format"><?php _e( 'Status', 'twentyeleven' ); ?></h2>
 			</hgroup>
 
 			<?php if ( 'post' == $post->post_type ) : ?>
diff --git a/wp-content/themes/twentyeleven/style.css b/wp-content/themes/twentyeleven/style.css
index 60a49aa834..6b4598071c 100644
--- a/wp-content/themes/twentyeleven/style.css
+++ b/wp-content/themes/twentyeleven/style.css
@@ -617,6 +617,10 @@ a:hover {
 	border-color: #000;
 	color: #222;
 }
+#branding .only-search #s,
+#branding .only-search #s:focus {
+	width: 85%;
+}
 #branding .only-search #s:focus {
 	background-color: #bbb;
 }
@@ -624,6 +628,9 @@ a:hover {
 	top: auto;
 	bottom: -27px;
 }
+#branding .only-search + #access div {
+	padding-right: 160px;
+}
 
 
 /* =Content
@@ -1033,7 +1040,6 @@ article.format-status .entry-content {
 }
 .format-image footer.entry-meta {
 	background: #e0e6e8;
-	margin-right: 2px;
 	margin-top: -6px;
 	padding: 20px 30px;
 	overflow: hidden;