From cf99ea1a46e1713161b41b926d0be6a2e92a036c Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 2 Sep 2021 08:55:00 +0100
Subject: [PATCH] MDL-72462 forms: style checkbox/radio field labels
 consistently.

Fixes small regression from 942dc9de that moved indentation of form
fields to the label node, but only for those labels with specific
class.
---
 lib/form/templates/element-advcheckbox.mustache | 4 ++--
 lib/form/templates/element-checkbox.mustache    | 4 ++--
 lib/form/templates/element-radio.mustache       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/form/templates/element-advcheckbox.mustache b/lib/form/templates/element-advcheckbox.mustache
index 0e927e088ad..7868498ceae 100644
--- a/lib/form/templates/element-advcheckbox.mustache
+++ b/lib/form/templates/element-advcheckbox.mustache
@@ -1,7 +1,7 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-3">
+    <div class="col-md-3 col-form-label pb-0 pt-0">
         {{#text}}
-            <label for="{{element.id}}">
+            <label class="d-inline word-break" for="{{element.id}}">
                 {{{label}}}
             </label>
         {{/text}}
diff --git a/lib/form/templates/element-checkbox.mustache b/lib/form/templates/element-checkbox.mustache
index ce1cd2e7bba..ccaea1969cb 100644
--- a/lib/form/templates/element-checkbox.mustache
+++ b/lib/form/templates/element-checkbox.mustache
@@ -1,7 +1,7 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-3">
+    <div class="col-md-3 col-form-label pb-0 pt-0">
         {{#text}}
-            <label for="{{element.id}}">
+            <label class="d-inline word-break" for="{{element.id}}">
                 {{{label}}}
             </label>
         {{/text}}
diff --git a/lib/form/templates/element-radio.mustache b/lib/form/templates/element-radio.mustache
index 0efeff5037a..76fb692b590 100644
--- a/lib/form/templates/element-radio.mustache
+++ b/lib/form/templates/element-radio.mustache
@@ -11,9 +11,9 @@
 
 }}
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-    <div class="col-md-3">
+    <div class="col-md-3 col-form-label pb-0 pt-0">
         {{#text}}
-            <label for="{{element.id}}">
+            <label class="d-inline word-break" for="{{element.id}}">
                 {{{label}}}
             </label>
         {{/text}}