Index: /trunk/wp-content/themes/twentythirteen/style.css =================================================================== --- /trunk/wp-content/themes/twentythirteen/style.css (revision 24523) +++ /trunk/wp-content/themes/twentythirteen/style.css (revision 24524) @@ -917,5 +917,5 @@ } -.site-header .searchform { +.site-header .search-form { position: absolute; right: 20px; @@ -923,6 +923,5 @@ } -.site-header .searchform [type="search"], -.site-header .searchform [type="text"] { +.site-header .search-field { background-color: transparent; background-image: url(images/search-icon.png); @@ -941,6 +940,5 @@ } -.site-header .searchform [type="search"]:focus, -.site-header .searchform [type="text"]:focus { +.site-header .search-field:focus { background-color: #fff; border: 2px solid #c3c0ab; @@ -2521,10 +2519,6 @@ /* Search widget */ -.searchform [type="submit"] { +.search-form .search-submit { display: none; -} - -.widget .searchform [type="text"] { - width: 100%; } @@ -3099,6 +3093,5 @@ (min-resolution: 120dpi) { - .site-header .searchform [type="search"], - .site-header .searchform [type="text"] { + .site-header .search-field { background-image: url(images/search-icon-2x.png); } Index: /trunk/wp-includes/general-template.php =================================================================== --- /trunk/wp-includes/general-template.php (revision 24523) +++ /trunk/wp-includes/general-template.php (revision 24524) @@ -166,9 +166,10 @@ } else { if ( 'html5' == $format ) { - $form = '