Merge branch 'MDL-60831-33' of git://github.com/ankitagarwal/moodle i…

…nto MOODLE_33_STABLE
moodle · Nov 22, 2017 · 657cb6b · 657cb6b
2 parents 04be8aa + e8605c6
commit 657cb6b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/blocks/globalsearch/block_globalsearch.php b/blocks/globalsearch/block_globalsearch.php
@@ -74,12 +74,13 @@ public function get_content() {
         // Input.
         $this->content->text .= html_writer::tag('label', get_string('search', 'search'),
             array('for' => 'searchform_search', 'class' => 'accesshide'));
-        $inputoptions = array('id' => 'searchform_search', 'name' => 'q', 'type' => 'text', 'size' => '15');
+        $inputoptions = array('id' => 'searchform_search', 'name' => 'q', 'class' => 'form-control',
+            'type' => 'text', 'size' => '15');
         $this->content->text .= html_writer::empty_tag('input', $inputoptions);
 
         // Search button.
         $this->content->text .= html_writer::tag('button', get_string('search', 'search'),
-            array('id' => 'searchform_button', 'type' => 'submit', 'title' => 'globalsearch'));
+            array('id' => 'searchform_button', 'type' => 'submit', 'title' => 'globalsearch', 'class' => 'btn btn-secondary'));
         $this->content->text .= html_writer::end_tag('fieldset');
         $this->content->text .= html_writer::end_tag('form');
         $this->content->text .= html_writer::end_tag('div');