mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-71947-master' of https://github.com/bmbrands/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-06-29 11:39:26 +02:00
commit 4242216e86
6 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/form/templates/element-template.mustache
View File

@ -56,7 +56,7 @@
</span>
{{/element.staticlabel}}
{{/ label }}{{/ label}}
<div class="ml-1 ml-md-auto d-flex align-items-center align-self-start">
<div class="form-label-addon d-flex align-items-center align-self-start">
{{#required}}
<div class="text-danger" title="{{#str}}required{{/str}}">
{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}

1
mod/quiz/accessmanager_form.php
View File

@ -56,6 +56,7 @@ class mod_quiz_preflight_check_form extends moodleform {
}
$this->add_action_buttons(true, get_string('startattempt', 'quiz'));
$this->set_display_vertical();
$mform->setDisableShortforms();
}

21
mod/quiz/styles.css
View File

@ -303,33 +303,14 @@ table.quizattemptsummary .noreviewmessage {
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup {
width: 600px;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-wrap {
overflow: hidden;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-bd {
padding: 0;
padding: 1rem;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-bd #mod_quiz_preflight_form legend {
padding: 0 10px;
margin: 0;
border: 0 none;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-bd #mod_quiz_preflight_form .fitem {
margin-left: 10px;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-bd #mod_quiz_preflight_form #fgroup_id_buttonar {
padding: 10px 0 0;
margin: 0;
}
.moodle-dialogue-base .moodle-dialogue.mod_quiz_preflight_popup .moodle-dialogue-content .moodle-dialogue-ft {
margin: 0;
}
/* Standard Moodle rule that needs to be more specific here. */
.moodle-dialogue-bd #mod_quiz_preflight_form fieldset.hidden {
display: inherit;

16
theme/boost/scss/moodle/forms.scss
View File

@ -365,7 +365,8 @@ textarea[data-auto-rows] {
margin-right: 0;
& > .col-md-3,
& > .col-md-9 {
float: none;
flex: 0 0 100%;
max-width: 100%;
width: inherit;
padding-right: 0;
padding-left: 0;
@ -373,6 +374,19 @@ textarea[data-auto-rows] {
&.femptylabel > .col-md-3 {
display: none;
}
.form-control {
width: 100%;
}
}
}
.mform .col-form-label .form-label-addon {
margin-left: 0.25rem;
}
@include media-breakpoint-up(sm) {
.mform:not(.full-width-labels) .col-form-label .form-label-addon {
margin-left: auto;
}
}

12
theme/boost/style/moodle.css
View File

@ -16664,12 +16664,22 @@ textarea[data-auto-rows] {
margin-right: 0; }
.mform.full-width-labels .fitem.row > .col-md-3,
.mform.full-width-labels .fitem.row > .col-md-9 {
float: none;
flex: 0 0 100%;
max-width: 100%;
width: inherit;
padding-right: 0;
padding-left: 0; }
.mform.full-width-labels .fitem.row.femptylabel > .col-md-3 {
display: none; }
.mform.full-width-labels .fitem.row .form-control {
width: 100%; }
.mform .col-form-label .form-label-addon {
margin-left: 0.25rem; }
@media (min-width: 576px) {
.mform:not(.full-width-labels) .col-form-label .form-label-addon {
margin-left: auto; } }
/** Allow wrapping an mform in a div with the form-inline class to have an inline, responsive form. */
@media (min-width: 768px) {

12
theme/classic/style/moodle.css
View File

@ -16898,12 +16898,22 @@ textarea[data-auto-rows] {
margin-right: 0; }
.mform.full-width-labels .fitem.row > .col-md-3,
.mform.full-width-labels .fitem.row > .col-md-9 {
float: none;
flex: 0 0 100%;
max-width: 100%;
width: inherit;
padding-right: 0;
padding-left: 0; }
.mform.full-width-labels .fitem.row.femptylabel > .col-md-3 {
display: none; }
.mform.full-width-labels .fitem.row .form-control {
width: 100%; }
.mform .col-form-label .form-label-addon {
margin-left: 0.25rem; }
@media (min-width: 576px) {
.mform:not(.full-width-labels) .col-form-label .form-label-addon {
margin-left: auto; } }
/** Allow wrapping an mform in a div with the form-inline class to have an inline, responsive form. */
@media (min-width: 768px) {