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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-05-10 20:50:20 +02:00
commit a7a5d10319
5 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
badges/criteria/award_criteria.php
View file

@ -210,7 +210,8 @@ abstract class award_criteria {
$mform->addGroup($parameter, 'param_' . $prefix . $param['id'], '', array(' '), false); $mform->addGroup($parameter, 'param_' . $prefix . $param['id'], '', array(' '), false);
} else { } else {
$parameter[] =& $mform->createElement('advcheckbox', $prefix . $param['id'], '', $param['name'], null, array(0, $param['id'])); $parameter[] =& $mform->createElement('advcheckbox', $prefix . $param['id'], '', $param['name'], null, array(0, $param['id']));
$parameter[] =& $mform->createElement('static', 'break_start_' . $param['id'], null, '<div style="margin-left: 3em;">'); $parameter[] =& $mform->createElement('static', 'break_start_' . $param['id'], null,
'<div class="ml-3 mt-1 w-100 align-items-center">');
if (in_array('grade', $this->optional_params)) { if (in_array('grade', $this->optional_params)) {
$parameter[] =& $mform->createElement('static', 'mgrade_' . $param['id'], null, get_string('mingrade', 'badges')); $parameter[] =& $mform->createElement('static', 'mgrade_' . $param['id'], null, get_string('mingrade', 'badges'));

4
theme/boost/scss/moodle/bs4alphacompat.scss
View file

@ -131,10 +131,6 @@ $tag-font-weight: bold !default;
position: static; position: static;
} }
.form-check .form-check-input {
position: absolute;
}
@mixin tag-variant($color) { @mixin tag-variant($color) {
background-color: $color; background-color: $color;

2
theme/boost/scss/moodle/forms.scss
View file

@ -28,7 +28,7 @@
max-width: 100%; max-width: 100%;
} }
.form-group { .form-group {
margin-right: 0.25rem; margin: 0.1rem 0.25rem 0.1rem 0;
} }
} }

2
theme/boost/templates/core_form/element-date_selector-inline.mustache
View file

@ -1,6 +1,6 @@
{{< core_form/element-template-inline }} {{< core_form/element-template-inline }}
{{$element}} {{$element}}
<span class="fdate_selector"> <span class="fdate_selector d-flex align-items-center">
{{#element.elements}} {{#element.elements}}
{{{separator}}} {{{separator}}}
{{{html}}} {{{html}}}

2
theme/boost/templates/core_form/element-date_selector.mustache
View file

@ -1,6 +1,6 @@
{{< core_form/element-template }} {{< core_form/element-template }}
{{$element}} {{$element}}
<span class="fdate_selector"> <span class="fdate_selector d-flex">
{{#element.elements}} {{#element.elements}}
{{{separator}}} {{{separator}}}
{{{html}}} {{{html}}}