From 7ee778b773708daa9c3c873e744d8cf830abbbaf Mon Sep 17 00:00:00 2001
From: Henry Cooksley <henry.cooksley@digital.trade.gov.uk>
Date: Mon, 6 Jan 2025 16:42:36 +0000
Subject: [PATCH 1/2] Change span to label so for attribute works

---
 lite_forms/templates/components.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lite_forms/templates/components.html b/lite_forms/templates/components.html
index 7b1a77d23b..40883d1779 100644
--- a/lite_forms/templates/components.html
+++ b/lite_forms/templates/components.html
@@ -18,25 +18,25 @@
 		</label>
 	{% endif %}
 	{% if question.description %}
-		<span class="govuk-hint" for="{{ question.name }}">
+		<label class="govuk-hint" for="{{ question.name }}">
 			<span>{{ question.description|safe }}</span>
-		</span>
+		</label>
 	{% endif %}
 	{% if question.accessible_description %}
-		<span class="govuk-hint govuk-visually-hidden" for="{{ question.name }}">
+		<label class="govuk-hint govuk-visually-hidden" for="{{ question.name }}">
 			{{ question.accessible_description }}
-		</span>
+		</label>
 	{% endif %}
 
 	<!-- Error -->
 	{% if errors %}
 		{% if errors|key_value:question.name and question.input_type != "hidden" %}
-			<span id="error-{{ question.name }}" for="{{ question.name }}" class="govuk-error-message">
+			<label id="error-{{ question.name }}" for="{{ question.name }}" class="govuk-error-message">
 				<span class="govuk-visually-hidden">Error:</span>
 				{% for error in errors|key_value:question.name %}
 					{{ error }}
 				{% endfor %}
-			</span>
+			</label>
 		{% endif %}
 	{% endif %}
 

From 46dfb12f91556e3840cb22e6b00701cad7f6aa58 Mon Sep 17 00:00:00 2001
From: Henry Cooksley <henry.cooksley@digital.trade.gov.uk>
Date: Tue, 14 Jan 2025 15:11:47 +0000
Subject: [PATCH 2/2] Fix error message html to match design system example

---
 lite_forms/templates/components.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lite_forms/templates/components.html b/lite_forms/templates/components.html
index 40883d1779..18025e58d5 100644
--- a/lite_forms/templates/components.html
+++ b/lite_forms/templates/components.html
@@ -31,12 +31,12 @@
 	<!-- Error -->
 	{% if errors %}
 		{% if errors|key_value:question.name and question.input_type != "hidden" %}
-			<label id="error-{{ question.name }}" for="{{ question.name }}" class="govuk-error-message">
+			<span id="error-{{ question.name }}" class="govuk-error-message">
 				<span class="govuk-visually-hidden">Error:</span>
 				{% for error in errors|key_value:question.name %}
 					{{ error }}
 				{% endfor %}
-			</label>
+			</span>
 		{% endif %}
 	{% endif %}