Merge branch 'MDL-59632_master' of git://github.com/dmonllao/moodle

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 08e917b..cf2a2fa 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3176,7 +3176,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);

diff --git a/theme/boost/scss/moodle/search.scss b/theme/boost/scss/moodle/search.scss
index a125f5d..615d18d 100644 (file)
--- a/theme/boost/scss/moodle/search.scss
+++ b/theme/boost/scss/moodle/search.scss
@@ -36,6 +36,7 @@
 
 .search-input-wrapper > form > input {
     margin: 0;
+    height: 23px;
 }
 
 .search-input-wrapper form.expanded {