From 9ecde1378173411742c80319a78e780d58296a43 Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Wed, 26 Feb 2020 21:27:33 +1100 Subject: [PATCH 1/5] MDL-67970 search: fixed stray end tag (input) --- lib/outputrenderers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index 5f906948902..c8d581f765e 100644 --- a/lib/outputrenderers.php +++ b/lib/outputrenderers.php @@ -3217,7 +3217,7 @@ EOD; '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); + array('for' => 'id_q_' . $id, 'class' => 'accesshide')) . html_writer::empty_tag('input', $inputattrs); if ($this->page->context && $this->page->context->contextlevel !== CONTEXT_SYSTEM) { $contents .= html_writer::empty_tag('input', ['type' => 'hidden', 'name' => 'context', 'value' => $this->page->context->id]); From 84c87b62f2d9d7d716a5897ae3fa25437cb4d63f Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Wed, 26 Feb 2020 22:54:29 +1100 Subject: [PATCH 2/5] MDL-67970 output: fixed duplicate id attribute action_menu::export_for_template generates the id attributes and send it to core/action_menu_trigger template as part of the attributes variable. --- lib/templates/action_menu_trigger.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templates/action_menu_trigger.mustache b/lib/templates/action_menu_trigger.mustache index 0c1c3212071..cf34a04a6f6 100644 --- a/lib/templates/action_menu_trigger.mustache +++ b/lib/templates/action_menu_trigger.mustache @@ -92,7 +92,7 @@ {{/menutrigger}} {{#secondary}} - diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index 8004ec998a7..1ce59609370 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -1397,6 +1397,8 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { text-transform: uppercase; padding-top: 1.2em; padding-bottom: 0.4em; + margin-bottom: 0.5rem; + font-size: 100%; } .choosercontainer #chooseform .option .typename, diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 19bcb694f74..cc3d23d81d0 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -10822,7 +10822,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { .choosercontainer #chooseform .moduletypetitle { text-transform: uppercase; padding-top: 1.2em; - padding-bottom: 0.4em; } + padding-bottom: 0.4em; + margin-bottom: 0.5rem; + font-size: 100%; } .choosercontainer #chooseform .option .typename, .choosercontainer #chooseform .nonoption .typename { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 5f82a5cf712..f5909dce200 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -11073,7 +11073,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview { .choosercontainer #chooseform .moduletypetitle { text-transform: uppercase; padding-top: 1.2em; - padding-bottom: 0.4em; } + padding-bottom: 0.4em; + margin-bottom: 0.5rem; + font-size: 100%; } .choosercontainer #chooseform .option .typename, .choosercontainer #chooseform .nonoption .typename {