Merge branch 'MDL-62277-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)
badges/criteria/award_criteria.php
theme/boost/scss/moodle/bs4alphacompat.scss
theme/boost/scss/moodle/forms.scss
theme/boost/templates/core_form/element-date_selector-inline.mustache
theme/boost/templates/core_form/element-date_selector.mustache

index 7b323a5..0fb86e1 100644 (file)
@@ -210,7 +210,8 @@ abstract class award_criteria {
             $mform->addGroup($parameter, 'param_' . $prefix . $param['id'], '', array(' '), false);
         } else {
             $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)) {
                 $parameter[] =& $mform->createElement('static', 'mgrade_' . $param['id'], null, get_string('mingrade', 'badges'));
index d38dbd6..3442487 100644 (file)
@@ -131,10 +131,6 @@ $tag-font-weight: bold !default;
     position: static;
 }
 
-.form-check .form-check-input {
-    position: absolute;
-}
-
 @mixin tag-variant($color) {
     background-color: $color;
 
index 9f7a959..590da44 100644 (file)
@@ -28,7 +28,7 @@
         max-width: 100%;
     }
     .form-group {
-        margin-right: 0.25rem;
+        margin: 0.1rem 0.25rem 0.1rem 0;
     }
 }
 
index 8a06ef7..df5ccdb 100644 (file)
@@ -1,6 +1,6 @@
 {{< core_form/element-template-inline }}
     {{$element}}
-        <span class="fdate_selector">
+        <span class="fdate_selector d-flex align-items-center">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}
index 470fa81..250c491 100644 (file)
@@ -1,6 +1,6 @@
 {{< core_form/element-template }}
     {{$element}}
-        <span class="fdate_selector">
+        <span class="fdate_selector d-flex">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}