Merge branch 'MDL-40896' of git://github.com/timhunt/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

question/type/numerical/edit_numerical_form.php

@@ -186,8 +186,6 @@ class qtype_numerical_edit_form extends question_edit_form {
     protected function unit_group($mform) {
         $grouparray = array();
         $grouparray[] = $mform->createElement('text', 'unit', get_string('unit', 'quiz'), array('size'=>10));
-        $grouparray[] = $mform->createElement('static', '', '', ' ' .
-                get_string('multiplier', 'quiz').' ');
         $grouparray[] = $mform->createElement('text', 'multiplier',
                 get_string('multiplier', 'quiz'), array('size'=>10));
 

question/type/numerical/styles.css

@@ -34,6 +34,8 @@ body#page-question-type-numerical div[id^=fgroup_id_][id*=answeroptions_] .fgrou
     font-weight: bold;
 }
 
+body.path-question-type div#fgroup_id_penaltygrp label[for^=id_unitpenalty],
+body.path-question-type div[id^=fgroup_id_units_] label[for^='id_unit_'],
 body#page-question-type-numerical div[id^=fgroup_id_][id*=answeroptions_] label[for^='id_answer_']{
     position: absolute;
     left: -10000px;

theme/bootstrapbase/less/moodle/question.less

@@ -142,6 +142,12 @@
     margin-left: 0.3em;
     margin-right: 0.3em;
 }
+body.path-question-type .fitem_fgroup .accesshide {
+    font: inherit;
+    left: 0;
+    position: static;
+    padding-right: .3em;
+}
 .que {
     clear: left;
     text-align: left;