moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-68761-master' of git://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Jake Dallimore 2020-06-05 10:23:13 +08:00
commit 4925924f0f
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
question/type/multichoice/renderer.php
View file

@ -105,10 +105,12 @@ abstract class qtype_multichoice_renderer_base extends qtype_with_combined_feedb
$radiobuttons[] = $hidden . html_writer::empty_tag('input', $inputattributes) . $radiobuttons[] = $hidden . html_writer::empty_tag('input', $inputattributes) .
html_writer::tag('label', html_writer::tag('label',
html_writer::span($this->number_in_style($value, $question->answernumbering), 'answernumber') . html_writer::span($this->number_in_style($value, $question->answernumbering), 'answernumber') .
$question->make_html_inline($question->format_text( html_writer::tag('div',
$question->format_text(
$ans->answer, $ans->answerformat, $ans->answer, $ans->answerformat,
$qa, 'question', 'answer', $ansid)), $qa, 'question', 'answer', $ansid),
array('for' => $inputattributes['id'], 'class' => 'ml-1')); array('class' => 'flex-fill ml-1')),
array('for' => $inputattributes['id'], 'class' => 'd-flex w-100'));
// Param $options->suppresschoicefeedback is a hack specific to the // Param $options->suppresschoicefeedback is a hack specific to the
// oumultiresponse question type. It would be good to refactor to // oumultiresponse question type. It would be good to refactor to

9
question/type/multichoice/styles.css
View file

@ -6,8 +6,9 @@
.que.multichoice .answer div.r0, .que.multichoice .answer div.r0,
.que.multichoice .answer div.r1 { .que.multichoice .answer div.r1 {
padding: 0.3em 0 0.3em 25px; display: flex;
text-indent: -25px; margin: 0.25rem 0;
align-items: flex-start;
} }
.que.multichoice .answer div.r0 label, .que.multichoice .answer div.r0 label,
@ -21,9 +22,7 @@
.que.multichoice .answer div.r0 input, .que.multichoice .answer div.r0 input,
.que.multichoice .answer div.r1 input { .que.multichoice .answer div.r1 input {
margin: 0 5px; margin: 0.4rem 0.5rem;
padding: 0;
width: 15px;
} }
/* Editing form. */ /* Editing form. */