From c055645f1170500a5ab71e84cacc581be7116cd0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Fri, 12 Apr 2019 14:24:26 +0200
Subject: [PATCH] Move form input required-mark closer to caption

---
 static/css/utils/inputs.scss         | 7 +++----
 templates/widgets/aform/aform.hamlet | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/static/css/utils/inputs.scss b/static/css/utils/inputs.scss
index db16a94d3..6eaabc448 100644
--- a/static/css/utils/inputs.scss
+++ b/static/css/utils/inputs.scss
@@ -30,22 +30,21 @@
   padding-top: 6px;
 }
 
-.form-group__hint {
+.form-group__label__hint {
   margin-top: 7px;
   color: var(--color-fontsec);
   font-size: 0.9rem;
 }
 
 .form-group--required {
-
-  .form-group__label::after {
+  .form-group__label__caption::after {
     content: ' *';
     color: var(--color-error);
   }
 }
 
 .form-group--optional {
-  .form-group__label::after {
+  .form-group__label__caption::after {
     content: '';
   }
 }
diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 87f40532c..eddce8fdc 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -14,9 +14,10 @@ $case formLayout
         <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
           $if not (Blaze.null $ fvLabel view)
             <label .form-group__label for=#{fvId view}>
-              #{fvLabel view}
+              <span .form-group__label__caption>
+                #{fvLabel view}
               $maybe hint <- fvTooltip view
-                <div .form-group__hint>^{hint}
+                <div .form-group__label__hint>^{hint}
           <div .form-group__input>
             ^{fvInput view}
             $maybe err <- fvErrors view