Fix search block appearence

1. +++ b/includes/form.inc
   @@ -29,6 +29,7 @@ function bootstrap_form_search_form_alter(&$form, &$form_state) {
      $form['basic']['keys']['#attributes']['class'][] = 'search-query';
   
   @@ -50,6 +51,7 @@ function bootstrap_form_search_block_form_alter(&$form, &$form_state) {
      $form['search_block_form']['#attributes']['class'][] = 'search-query';
   

   I think these can be removed (ie: not used in BS3).

2. +++ b/includes/form.inc
   @@ -29,6 +29,7 @@ function bootstrap_form_search_form_alter(&$form, &$form_state) {
   +  $form['basic']['keys']['#attributes']['class'][] = 'form-control';
   
   @@ -50,6 +51,7 @@ function bootstrap_form_search_block_form_alter(&$form, &$form_state) {
   +  $form['search_block_form']['#attributes']['class'][] = 'form-control';
   

   These are no longer needed.

3. +++ b/template.php
   @@ -261,13 +261,20 @@ function bootstrap_process_block(&$variables, $hook) {
   +  // fixme: dunno why padding is off by 2 px...
   +  $output .= '<button style="padding-top: 5px; padding-bottom: 5px" class="btn btn-default" type="button">';
   

   Definitely cannot commit inline styles. This will need to be fixed before committed. Perhaps in #2084331: Update and recompile the overrides.less/css file?

4. +++ b/template.php
   @@ -261,13 +261,20 @@ function bootstrap_process_block(&$variables, $hook) {
   +  if (icon_bundles('bootstrap')) {
   +    $output .= '<i class="glyphicon glyphicon-search"></i>';
   +  } else {
   +    $output .= '<i class="icon-search"></i>';
   +  }
   

   This should just be (no else):

   if (module_exists('icon')) {
     $output .= theme('icon', array('bundle' => 'bootstrap', 'icon' => 'glyphicon-search'));
   }
   

5. +++ b/template.php
   @@ -261,13 +261,20 @@ function bootstrap_process_block(&$variables, $hook) {
   diff --git a/templates/search-block-form.tpl.php b/templates/search-block-form.tpl.php
   
   diff --git a/templates/search-block-form.tpl.php b/templates/search-block-form.tpl.php
   new file mode 100644
   
   new file mode 100644
   index 0000000..aa19949
   
   index 0000000..aa19949
   --- /dev/null
   
   --- /dev/null
   +++ b/templates/search-block-form.tpl.php
   
   +++ b/templates/search-block-form.tpl.php
   +++ b/templates/search-block-form.tpl.php
   @@ -0,0 +1,6 @@
   
   @@ -0,0 +1,6 @@
   +<div>
   +  <?php if (empty($variables['form']['#block']->subject)): ?>
   +    <h2 class="element-invisible"><?php print t('Search form'); ?></h2>
   +  <?php endif; ?>
   +  <?php print $search_form; ?>
   +</div>
   

   What's the purpose of copying the search-block-form.tpl.php into this theme? Removing markup?

2. No it's not, I just committed this fix in #2084343-21: Form preprocessing needs to be refactored.
3. We can address any styling issues in #2084331: Update and recompile the overrides.less/css file, not as inline styles.

How about this?

Actually now that I think about it, it makes sense to always wrap and only include the icon if IconAPI exists.

Committed c07d39a to 7.x-3.x.

Hi.

I think this is the right issue.

Up to date Safari and Chrome:

Firefox:

I can't find 7.x-3.0-beta1 but I've tested with rc1 and -dev and this case remains.

Actually @staminna, this relates to the search block in the navbar (entirely different issue). Please create new issues instead of open fixed ones.

Wrong status

Concerning #12: #2113693: search block in navbar strange behaviour