From 97490d8ad61256ac32ab3f158e624a922934ce95 Mon Sep 17 00:00:00 2001
From: Philipp Veller <mail@vellip.de>
Date: Fri, 27 Sep 2024 09:44:05 +0200
Subject: [PATCH] form_field.html: moved helptext to above input field

---
 .../meinberlin_contrib/includes/form_field.html      | 12 ++++++------
 meinberlin/assets/scss/styles_user_facing/_form.scss |  7 ++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field.html b/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field.html
index c7380fc744..dab2805a96 100644
--- a/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field.html
+++ b/meinberlin/apps/contrib/templates/meinberlin_contrib/includes/form_field.html
@@ -10,18 +10,18 @@
         {% block after_label %}{% endblock after_label %}
     </label>
 
-    {% block field %}
-        <div class="widget widget--{{ field|widget_type }}">
-            {{ field|add_error_attr:"aria-invalid:true" }}
-        </div>
-    {% endblock field %}
-
     {% if field.help_text and not field.name == "password" %}
         <span class="formgroup__help">
             {{ field.help_text }}
         </span>
     {% endif %}
 
+    {% block field %}
+        <div class="widget widget--{{ field|widget_type }}">
+            {{ field|add_error_attr:"aria-invalid:true" }}
+        </div>
+    {% endblock field %}
+
     {% if field.errors %}
         <ul class="errorlist" aria-live="assertive" aria-atomic="true">
             {% for error in field.errors %}
diff --git a/meinberlin/assets/scss/styles_user_facing/_form.scss b/meinberlin/assets/scss/styles_user_facing/_form.scss
index 7292e40df1..49a5108466 100644
--- a/meinberlin/assets/scss/styles_user_facing/_form.scss
+++ b/meinberlin/assets/scss/styles_user_facing/_form.scss
@@ -15,4 +15,9 @@ button {
 
 .formgroup__help {
   font-size: 14px;
-}
\ No newline at end of file
+
+  label + & {
+    margin-top: -0.4em;
+    margin-bottom: 0.4em;
+  }
+}