Merge branch 'main' into enhancement/3060/change-status-wording

ONSdigital · Mar 25, 2024 · f96412a · f96412a
2 parents 4cb9f03 + dbe543f
commit f96412a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/...onents_duration_example-duration-error-for-single-field_0_document_2_mobile.png b/...onents_duration_example-duration-error-for-single-field_0_document_2_mobile.png
diff --git a/.../ds-vr-test__components_duration_example-duration-error_0_document_2_mobile.png b/.../ds-vr-test__components_duration_example-duration-error_0_document_2_mobile.png
diff --git a/...st__patterns_correct-errors_example-errors-proto-errors_0_document_2_mobile.png b/...st__patterns_correct-errors_example-errors-proto-errors_0_document_2_mobile.png
diff --git a/src/components/field/_field-group.scss b/src/components/field/_field-group.scss
@@ -1,14 +1,13 @@
 .ons-field-group {
   font-size: 0;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 1rem;
 
   .ons-field {
     display: inline-block;
     font-size: 1rem;
     margin-top: 0;
     vertical-align: top;
-
-    &:not(:last-child) {
-      margin-right: 1rem;
-    }
   }
 }
diff --git a/src/components/label/_macro.njk b/src/components/label/_macro.njk
@@ -21,8 +21,8 @@
     {%- else -%}
     <label
         class="{% if params.inputType is not defined -%}ons-label{%- endif %}{{- ' ' + params.classes if params.classes else "" -}}{%- if params.description %} ons-label--with-description{%- endif %} {{- ' ons-label--placeholder' if params.accessiblePlaceholder else "" -}}"
+        for="{{ params.for }}"
         {% if params.description %}aria-describedby="{{ descriptionID }}"{% endif %}
-        {% if params.for %} for="{{ params.for }}"{% endif %}
         {% if params.id %} id="{{ params.id }}"{% endif %}
         {% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}
     >