Merge branch 'MDL-70374_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE

2021-01-07 12:23:34 +08:00
parent bb9e3ec1ff 438b2ac8c2
commit 137b10b378
2 changed files with 9 additions and 1 deletions
@@ -104,7 +104,11 @@ abstract class qtype_multichoice_renderer_base extends qtype_with_combined_feedb
                ));
            }

-            $questionnumber = html_writer::span($this->number_in_style($value, $question->answernumbering), 'answernumber');
+            $questionnumber = '';
+            if ($question->answernumbering !== 'none') {
+                $questionnumber = html_writer::span(
+                        $this->number_in_style($value, $question->answernumbering), 'answernumber');
+            }
            $answertext = $question->format_text($ans->answer, $ans->answerformat, $qa, 'question', 'answer', $ansid);
            $questionanswer = html_writer::div($answertext, 'flex-fill ml-1');

@@ -26,6 +26,10 @@
    width: 14px;
 }

+.que.multichoice .answer .answernumber {
+    min-width: 1.5em;
+}
+
 /* Editing form. */
 body#page-question-type-multichoice div[id^=fitem_id_][id*=answer_] {
    background: #eee;