Fix select help text spacing

codeforamerica · Feb 6, 2025 · 0ded2d0 · 0ded2d0
1 parent aeedc1c
commit 0ded2d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/assets/stylesheets/honeycrisp/atoms/_form-elements.scss b/app/assets/stylesheets/honeycrisp/atoms/_form-elements.scss
@@ -26,6 +26,9 @@ label {
   display: block;
   margin-bottom: $s25;
   font-weight: $font-weight-bold;
+  &.has-help {
+    margin-bottom: unset;
+  }
 }
 
 .text-input {

diff --git a/app/helpers/cfa/styleguide/cfa_form_builder.rb b/app/helpers/cfa/styleguide/cfa_form_builder.rb
@@ -379,6 +379,7 @@ def cfa_select(
           label_contents(
             label_text,
             optional: options[:optional],
+            has_help_text: !!help_text,
           ),
           class: options[:hide_label] ? "sr-only" : "",
         )
@@ -457,9 +458,13 @@ def fieldset_label_contents(
         label_html.html_safe
       end
 
-      def label_contents(label_text, optional: false)
+      def label_contents(label_text, optional: false, has_help_text: false)
+        classes = ["form-question"]
+        if has_help_text
+          classes << "has-help"
+        end
         label_text = <<~HTML
-          <span class="form-question">#{label_text + optional_text(optional)}</span>
+          <span class="#{classes.join(' ')}">#{label_text + optional_text(optional)}</span>
         HTML
 
         label_text.html_safe
@@ -495,7 +500,7 @@ def label_and_field(
 
         formatted_label = label(
           method,
-          label_contents(label_text, optional: optional),
+          label_contents(label_text, optional: optional, has_help_text: !!help_text),
           (for_options || options),
         )
         formatted_label += notice_html(notice).html_safe if notice