Index: wp-content/themes/twentyeleven/searchform.php =================================================================== --- wp-content/themes/twentyeleven/searchform.php (revision 23884) +++ wp-content/themes/twentyeleven/searchform.php (working copy) @@ -6,9 +6,18 @@ * @subpackage Twenty_Eleven * @since Twenty Eleven 1.0 */ + +// Compat for WP < 3.6 +if ( ! isset( $search_form_counter ) ) { + static $search_form_counter = -1; + $search_form_counter++; + $form_id = $search_form_counter ? '' : ' id="searchform"'; + $submit_id = $search_form_counter ? '' : ' id="searchsubmit"'; + $text_id = $search_form_counter ? 's-' . $search_form_counter : 's'; +} ?> -
Index: wp-content/themes/twentyeleven/style.css =================================================================== --- wp-content/themes/twentyeleven/style.css (revision 23884) +++ wp-content/themes/twentyeleven/style.css (working copy) @@ -279,7 +279,7 @@ width: auto; } /* Make sure the logo and search form don't collide */ -.one-column #branding #searchform { +.one-column #branding .searchform { right: 40px; top: 4em; } @@ -468,7 +468,7 @@ input[type=number] { padding: 3px; } -input#s { +.searchform input.field { background: url(images/search.png) no-repeat 5px 6px; -moz-border-radius: 2px; border-radius: 2px; @@ -477,7 +477,7 @@ line-height: 1.2em; padding: 4px 10px 4px 28px; } -input#searchsubmit { +.searchform input.submit { display: none; } @@ -636,16 +636,16 @@ } /* Search Form */ -#branding #searchform { +#branding .searchform { position: absolute; top: 3.8em; right: 7.6%; text-align: right; } -#branding #searchform div { +#branding .searchform div { margin: 0; } -#branding #s { +#branding .searchform .field { float: right; -webkit-transition-duration: 400ms; -webkit-transition-property: width, background; @@ -658,30 +658,30 @@ -o-transition-timing-function: ease; width: 72px; } -#branding #s:focus { +#branding .searchform .field:focus { background-color: #f9f9f9; width: 196px; } -#branding #searchsubmit { +#branding .searchform .submit { display: none; } -#branding .only-search #searchform { +#branding .only-search .searchform { top: 5px; z-index: 1; } -#branding .only-search #s { +#branding .only-search .searchform .field { background-color: #666; border-color: #000; color: #222; } -#branding .only-search #s, -#branding .only-search #s:focus { +#branding .only-search .searchform .field, +#branding .only-search .searchform .field:focus { width: 85%; } -#branding .only-search #s:focus { +#branding .only-search .searchform .field:focus { background-color: #bbb; } -#branding .with-image #searchform { +#branding .with-image .searchform { top: auto; bottom: -27px; max-width: 195px; @@ -803,7 +803,7 @@ border-top: 1px solid #ddd; padding: 6px 10px 6px 0; } -.entry-content #s { +.entry-content .searchform .field { width: 75%; } .comment-content ul, @@ -1322,7 +1322,7 @@ /* =error404 ----------------------------------------------- */ -.error404 #main #searchform { +.error404 #main .searchform { background: #f9f9f9; border: 1px solid #ddd; border-width: 1px 0; @@ -1330,7 +1330,7 @@ overflow: hidden; padding: 1.625em 8.9%; } -.error404 #main #s { +.error404 #main .searchform .field { width: 95%; } .error404 #main .widget { @@ -1809,10 +1809,10 @@ .widget_search form { margin: 0 0 1.625em; } -.widget_search #s { +.widget_search .searchform .field { width: 77%; } -.widget_search #searchsubmit { +.widget_search .searchform .submit { background: #ddd; border: 1px solid #ccc; -webkit-box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.09); @@ -1824,7 +1824,7 @@ position: relative; top: -2px; } -.widget_search #searchsubmit:active { +.widget_search .searchform .submit:active { background: #1982d1; border-color: #0861a5; -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1); @@ -2440,7 +2440,7 @@ margin-right: 0; } /* Make sure the logo and search form don't collide */ - #branding #searchform { + #branding .searchform { top: 1.625em !important; } /* Floated content doesn't work well at this size */ @@ -2555,7 +2555,7 @@ #site-description { font-size: 10pt; } - #branding #searchform { + #branding .searchform { display: none; } #branding img {