Merge branch 'MDL-59632_32' of git://github.com/dmonllao/moodle into MOODLE_32_STABLE

2017-07-31 11:33:09 +01:00
parent 15e9965d66 3ac7b54f9c
commit 5d65c618b4
2 changed files with 2 additions and 1 deletions
@@ -3210,7 +3210,7 @@ EOD;
            array('role' => 'button', 'tabindex' => 0));
        $formattrs = array('class' => 'search-input-form', 'action' => $CFG->wwwroot . '/search/index.php');
        $inputattrs = array('type' => 'text', 'name' => 'q', 'placeholder' => get_string('search', 'search'),
-            'size' => 13, 'tabindex' => -1, 'id' => 'id_q_' . $id);
+            'size' => 13, 'tabindex' => -1, 'id' => 'id_q_' . $id, 'class' => 'form-control');

        $contents = html_writer::tag('label', get_string('enteryoursearchquery', 'search'),
            array('for' => 'id_q_' . $id, 'class' => 'accesshide')) . html_writer::tag('input', '', $inputattrs);
@@ -36,6 +36,7 @@

 .search-input-wrapper > form > input {
    margin: 0;
+    height: 23px;
 }

 .search-input-wrapper form.expanded {