MDL-62277 Theme boost: add badge criteria layout

timhunt · May 10, 2018 · f017341 · f017341
1 parent 51e53b9
commit f017341
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/badges/criteria/award_criteria.php b/badges/criteria/award_criteria.php
@@ -210,7 +210,8 @@ public function config_options(&$mform, $param) {
             $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'));

diff --git a/theme/boost/scss/moodle/bs4alphacompat.scss b/theme/boost/scss/moodle/bs4alphacompat.scss
@@ -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;
 

diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
@@ -28,7 +28,7 @@
         max-width: 100%;
     }
     .form-group {
-        margin-right: 0.25rem;
+        margin: 0.1rem 0.25rem 0.1rem 0;
     }
 }
 

diff --git a/theme/boost/templates/core_form/element-date_selector-inline.mustache b/theme/boost/templates/core_form/element-date_selector-inline.mustache
@@ -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}}}

diff --git a/theme/boost/templates/core_form/element-date_selector.mustache b/theme/boost/templates/core_form/element-date_selector.mustache
@@ -1,6 +1,6 @@
 {{< core_form/element-template }}
     {{$element}}
-        <span class="fdate_selector">
+        <span class="fdate_selector d-flex">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}