Merge branch 'MDL-67487-master' of git://github.com/lucaboesch/moodle

diff --cc theme/boost/scss/moodle/forms.scss
Simple merge

diff --cc theme/boost/style/moodle.css
index cb2afa9,d3f74f5..01b77d5
--- 1/theme/boost/style/moodle.css
--- 2/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@@ -15875,10 -16184,11 +15875,12 @@@ textarea[data-auto-rows] 
          background-image: url([[pix:t/collapsed_rtl]]);
          */
      /*rtl:remove*/
-     background-image: url([[pix:t/collapsed]]); } }
+     background-image: url([[pix:t/collapsed]]); }
+   .mform .form-inline .fdefaultcustom label {
+     justify-content: initial; } }
  
  .input-group.form-inset .form-inset-item {
 +  position: absolute;
    padding-top: calc(0.375rem + 1px);
    z-index: 3; }
  

diff --cc theme/classic/style/moodle.css
index f201f95,56b098a..b3e5902
--- 1/theme/classic/style/moodle.css
--- 2/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@@ -16101,10 -16453,11 +16101,12 @@@ textarea[data-auto-rows] 
          background-image: url([[pix:t/collapsed_rtl]]);
          */
      /*rtl:remove*/
-     background-image: url([[pix:t/collapsed]]); } }
+     background-image: url([[pix:t/collapsed]]); }
+   .mform .form-inline .fdefaultcustom label {
+     justify-content: initial; } }
  
  .input-group.form-inset .form-inset-item {
 +  position: absolute;
    padding-top: calc(0.375rem + 1px);
    z-index: 3; }