From d9abaa3d39df146850b07a79ee6924e1b4572869 Mon Sep 17 00:00:00 2001
From: Sommerregen <sommerregen@users.noreply.github.com>
Date: Thu, 16 Jun 2016 21:33:11 +0200
Subject: [PATCH 1/2] Add field description to forms

---
 themes/grav/scss/template/_forms.scss       | 5 +++++
 themes/grav/templates/forms/field.html.twig | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/themes/grav/scss/template/_forms.scss b/themes/grav/scss/template/_forms.scss
index 7ff3e6f26..a72fbb1f1 100644
--- a/themes/grav/scss/template/_forms.scss
+++ b/themes/grav/scss/template/_forms.scss
@@ -21,6 +21,11 @@ form {
         padding: 1.5rem 3rem;
     }
 
+    .form-description {
+        font-weight: bold;
+        font-size: small;
+    }
+
     .form-field {
         margin-bottom: 1rem;
         padding-left: $padding-default;
diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig
index b6e909ee9..665fb887b 100644
--- a/themes/grav/templates/forms/field.html.twig
+++ b/themes/grav/templates/forms/field.html.twig
@@ -70,6 +70,11 @@
                         </div>
                     {% endblock %}
                 {% endblock %}
+                {% if field.description %}
+                    <div class="form-extra-wrapper {{ field.size }} {{ field.wrapper_classes }}">
+                        <span class="form-description">{{ field.description }}</span>
+                    </div>
+                {% endif %}
             </div>
         {% endblock %}
     </div>

From de0955b944fabfd1a0901d26e3a07cdc2dab0e21 Mon Sep 17 00:00:00 2001
From: Sommerregen <sommerregen@users.noreply.github.com>
Date: Thu, 16 Jun 2016 22:19:07 +0200
Subject: [PATCH 2/2] Allow HTML in field descriptions

---
 themes/grav/templates/forms/field.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig
index 665fb887b..a53ba1ddc 100644
--- a/themes/grav/templates/forms/field.html.twig
+++ b/themes/grav/templates/forms/field.html.twig
@@ -72,7 +72,7 @@
                 {% endblock %}
                 {% if field.description %}
                     <div class="form-extra-wrapper {{ field.size }} {{ field.wrapper_classes }}">
-                        <span class="form-description">{{ field.description }}</span>
+                        <span class="form-description">{{ field.description|raw }}</span>
                     </div>
                 {% endif %}
             </div>