Ticket #16539: rwi_searchidtoclass.diff

wp-includes/general-template.php

@@ -157 +157 @@
                 return;
         }
 
-        $form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
+        $form = '<form role="search" method="get" class="searchform" action="' . home_url( '/' ) . '" >
         <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
         <input type="text" value="' . get_search_query() . '" name="s" id="s" />
-        <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
+        <input type="submit" class="searchsubmit" value="'. esc_attr__('Search') .'" />
         </div>
         </form>';
 

wp-content/themes/twentyeleven/searchform.php

@@ -7 +7 @@
  * @since Twenty Eleven 1.0
  */
 ?>
-        <form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+        <form method="get" class="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
                 <label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
                 <input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
-                <input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
+                <input type="submit" class="submit searchsubmit" name="submit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
         </form>

wp-content/themes/twentyeleven/style.css

@@ -278 +278 @@
         width: auto;
 }
 /* Make sure the logo and search form don't collide */
-.one-column #branding #searchform {
+.one-column #branding .searchform {
         right: 40px;
         top: 4em;
 }
@@ -462 +462 @@
         line-height: 1.2em;
         padding: 4px 10px 4px 28px;
 }
-input#searchsubmit {
+input.searchsubmit {
         display: none;
 }
 
@@ -620 +620 @@
 }
 
 /* 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 {
@@ -646 +646 @@
         background-color: #f9f9f9;
         width: 196px;
 }
-#branding #searchsubmit {
+#branding .searchsubmit {
         display: none;
 }
-#branding .only-search #searchform {
+#branding .only-search .searchform {
         top: 5px;
         z-index: 1;
 }
@@ -665 +665 @@
 #branding .only-search #s:focus {
         background-color: #bbb;
 }
-#branding .with-image #searchform {
+#branding .with-image .searchform {
         top: auto;
         bottom: -27px;
 }
@@ -1276 +1276 @@
 /* =error404
 ----------------------------------------------- */
 
-.error404 #main #searchform {
+.error404 #main .searchform {
         background: #f9f9f9;
         border: 1px solid #ddd;
         border-width: 1px 0;
@@ -1761 +1761 @@
 .widget_search #s {
         width: 77%;
 }
-.widget_search #searchsubmit {
+.widget_search .searchsubmit {
         background: #ddd;
         border: 1px solid #ccc;
         -webkit-box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.09);
@@ -1773 +1773 @@
         position: relative;
         top: -2px;
 }
-.widget_search #searchsubmit:active {
+.widget_search .searchsubmit:active {
         background: #1982d1;
         border-color: #0861a5;
         -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
@@ -2398 +2398 @@
                 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 */
@@ -2512 +2512 @@
         #site-description {
                 font-size: 10pt;
         }
-        #branding #searchform {
+        #branding .searchform {
                 display: none;
         }
         #branding img {

wp-content/themes/twentyeleven/colors/dark.css

@@ -253 +253 @@
 
 /* =error404
 ----------------------------------------------- */
-.error404 #main #searchform {
+.error404 #main .searchform {
         background: #060606;
         border-color: #222;
 }
@@ -406 +406 @@
 }
 
 /* Search Widget */
-.widget_search #searchsubmit {
+.widget_search .searchsubmit {
         background: #222;
         border-color: #333;
         -webkit-box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.09);
@@ -414 +414 @@
         box-shadow: inset 0px -1px 1px rgba(0, 0, 0, 0.09);
         color: #777;
 }
-.widget_search #searchsubmit:active {
+.widget_search .searchsubmit:active {
         -webkit-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
         -moz-box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);
         box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.1);