Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Nunjucks HTML indentation: Radios and Checkboxes #4676

Merged
merged 6 commits into from
Feb 13, 2024
Merged

Fix Nunjucks HTML indentation: Radios and Checkboxes #4676

merged 6 commits into from
Feb 13, 2024

Conversation

colinrotherham
Copy link
Contributor

@colinrotherham colinrotherham commented Jan 26, 2024 •
edited
Loading

Radios and Checkboxes changes, split out from #4448 to partially resolve #3211

Similar to the _actionLink() and _summaryCard() macros in Summary list, I've added _radioItem() and _checkboxItem() macros to flatten the HTML indent level back to 2 spaces

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 26, 2024 •
edited
Loading

📋 Stats

File sizes

File Size
dist/govuk-frontend-development.min.css 112.45 KiB
dist/govuk-frontend-development.min.js 38.58 KiB
packages/govuk-frontend/dist/govuk/all.bundle.js 78.74 KiB
packages/govuk-frontend/dist/govuk/all.bundle.mjs 73.99 KiB
packages/govuk-frontend/dist/govuk/all.mjs 3.86 KiB
packages/govuk-frontend/dist/govuk/govuk-frontend-component.mjs 359 B
packages/govuk-frontend/dist/govuk/govuk-frontend.min.css 112.44 KiB
packages/govuk-frontend/dist/govuk/govuk-frontend.min.js 38.57 KiB
packages/govuk-frontend/dist/govuk/i18n.mjs 5.38 KiB

Modules

File Size
all.mjs 70.32 KiB
components/accordion/accordion.mjs 21.67 KiB
components/button/button.mjs 4.7 KiB
components/character-count/character-count.mjs 21.24 KiB
components/checkboxes/checkboxes.mjs 5.83 KiB
components/error-summary/error-summary.mjs 6.57 KiB
components/exit-this-page/exit-this-page.mjs 16.08 KiB
components/header/header.mjs 4.46 KiB
components/notification-banner/notification-banner.mjs 4.93 KiB
components/radios/radios.mjs 4.83 KiB
components/skip-link/skip-link.mjs 4.39 KiB
components/tabs/tabs.mjs 10.16 KiB

View stats and visualisations on the review app

Action run for 8b1b5aa

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 26, 2024 •
edited
Loading

Rendered HTML changes to npm package

diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-default.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-default.html
index dc8ebcf62..e9170f4fa 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-default.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-default.html
@@ -1,22 +1,22 @@
 <div class="govuk-form-group">
   <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british">
-            <label class="govuk-label govuk-checkboxes__label" for="nationality">
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british">
+      <label class="govuk-label govuk-checkboxes__label" for="nationality">
         British
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
-            <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
+      <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
         Irish
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
-            <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
+      <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
         Citizen of another country
       </label>
-          </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-conditional-reveal.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-conditional-reveal.html
index 935685a0b..18e89b29f 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-conditional-reveal.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-conditional-reveal.html
@@ -4,23 +4,22 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted" name="how-contacted" type="checkbox" value="a" data-aria-controls="conditional-how-contacted">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted" name="how-contacted" type="checkbox" value="a" data-aria-controls="conditional-how-contacted">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted">
           a thing
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted">
-                <label class="govuk-label" for="context-email">Foo</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-2" name="how-contacted" type="checkbox" value="b">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-2">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted">
+        <label class="govuk-label" for="context-email">Foo</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-2" name="how-contacted" type="checkbox" value="b">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-2">
           another thing
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-disabled.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-disabled.html
index 50b0bc3bc..1e6bc4d32 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-disabled.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-disabled.html
@@ -4,24 +4,24 @@
       Filter by
     </legend>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           a thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           another thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c" disabled>
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c" disabled>
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           this thing
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-error.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-error.html
index 4ff3320bb..b39366378 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-error.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-error.html
@@ -7,24 +7,24 @@
       <span class="govuk-visually-hidden">Error:</span> Select a thing
     </p>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           a thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           another thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           this thing
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-hint.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-hint.html
index 611035834..7daa864d4 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-hint.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-hint.html
@@ -4,27 +4,27 @@
       Filter by
     </legend>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a" aria-describedby="nationality-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a" aria-describedby="nationality-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           a thing
         </label>
-              <div id="nationality-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="nationality-item-hint" class="govuk-hint govuk-checkboxes__hint">
           hint for a thing
         </div>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           another thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           this thing
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-long-text.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-long-text.html
index bb00e51ef..4443e0d87 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-long-text.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small-with-long-text.html
@@ -4,24 +4,24 @@
       Filter by
     </legend>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="nullam">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="nullam">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           Nullam id dolor id nibh ultricies vehicula ut id elit. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum. Donec id elit non mi porta gravida at eget metus.
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="aenean">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="aenean">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet fermentum.
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="fusce">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="fusce">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Etiam porta sem malesuada magna mollis euismod. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Sed posuere consectetur est at lobortis.
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small.html
index 82c7c9b76..d00a5d2c0 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-small.html
@@ -4,24 +4,24 @@
       Filter by
     </legend>
     <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="a">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           a thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="b">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           another thing
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="c">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           this thing
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-a-medium-legend.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-a-medium-legend.html
index 6c443bd73..b46dbdb55 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-a-medium-legend.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-a-medium-legend.html
@@ -10,24 +10,24 @@
       <span class="govuk-visually-hidden">Error:</span> Select which types of waste you transport regularly
     </p>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
-              <label class="govuk-label govuk-checkboxes__label" for="waste">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
+        <label class="govuk-label govuk-checkboxes__label" for="waste">
           Waste from animal carcasses
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-2">
           Waste from mines or quarries
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-3">
           Farm or agricultural waste
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-item-checked.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-item-checked.html
index f8aa2f249..37db271fa 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-item-checked.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-item-checked.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked" name="how-contacted-checked" type="checkbox" value="email" checked data-aria-controls="conditional-how-contacted-checked">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked" name="how-contacted-checked" type="checkbox" value="email" checked data-aria-controls="conditional-how-contacted-checked">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked">
           Email
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional" id="conditional-how-contacted-checked">
-                <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked-2" name="how-contacted-checked" type="checkbox" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-2">
+      </div>
+      <div class="govuk-checkboxes__conditional" id="conditional-how-contacted-checked">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked-2" name="how-contacted-checked" type="checkbox" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-2">
           Phone
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-2">
-                <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked-3" name="how-contacted-checked" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-checked-3">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-3">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked-3" name="how-contacted-checked" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-checked-3">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-3">
           Text message
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-3">
-                <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-              </div>
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items-with-special-characters.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items-with-special-characters.html
index 861085cc0..d20c82aa4 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items-with-special-characters.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items-with-special-characters.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]" name="contact-prefs" type="checkbox" value="email" data-aria-controls="conditional-user.profile[contact-prefs]">
-              <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]" name="contact-prefs" type="checkbox" value="email" data-aria-controls="conditional-user.profile[contact-prefs]">
+        <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]">
           Email
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]">
-                <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]-2" name="contact-prefs" type="checkbox" value="phone" data-aria-controls="conditional-user.profile[contact-prefs]-2">
-              <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]-2">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]-2" name="contact-prefs" type="checkbox" value="phone" data-aria-controls="conditional-user.profile[contact-prefs]-2">
+        <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]-2">
           Phone
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]-2">
-                <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]-3" name="contact-prefs" type="checkbox" value="text" data-aria-controls="conditional-user.profile[contact-prefs]-3">
-              <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]-3">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="user.profile[contact-prefs]-3" name="contact-prefs" type="checkbox" value="text" data-aria-controls="conditional-user.profile[contact-prefs]-3">
+        <label class="govuk-label govuk-checkboxes__label" for="user.profile[contact-prefs]-3">
           Text message
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]-3">
-                <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-              </div>
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-user.profile[contact-prefs]-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items.html
index d4309bff5..3dcd5c18b 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-conditional-items.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted" name="with-conditional-items" type="checkbox" value="email" data-aria-controls="conditional-how-contacted">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted" name="with-conditional-items" type="checkbox" value="email" data-aria-controls="conditional-how-contacted">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted">
           Email
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted">
-                <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-2" name="with-conditional-items" type="checkbox" value="phone" data-aria-controls="conditional-how-contacted-2">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-2">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-2" name="with-conditional-items" type="checkbox" value="phone" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-2">
           Phone
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-2">
-                <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-3" name="with-conditional-items" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-3">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-3">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-3" name="with-conditional-items" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-3">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-3">
           Text message
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-3">
-                <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-              </div>
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-disabled-item.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-disabled-item.html
index da3055ed0..2c5a35cbe 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-disabled-item.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-disabled-item.html
@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="government-gateway" name="gateway" type="checkbox" value="gov-gateway" aria-describedby="government-gateway-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="government-gateway">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="government-gateway" name="gateway" type="checkbox" value="gov-gateway" aria-describedby="government-gateway-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="government-gateway">
           Sign in with Government Gateway
         </label>
-              <div id="government-gateway-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="government-gateway-item-hint" class="govuk-hint govuk-checkboxes__hint">
           You&#39;ll have a user ID if you&#39;ve registered for Self Assessment or filed a tax return online before.
         </div>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="govuk-verify" name="verify" type="checkbox" value="gov-verify" disabled aria-describedby="govuk-verify-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="govuk-verify">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="govuk-verify" name="verify" type="checkbox" value="gov-verify" disabled aria-describedby="govuk-verify-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="govuk-verify">
           Sign in with GOV.UK Verify
         </label>
-              <div id="govuk-verify-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="govuk-verify-item-hint" class="govuk-hint govuk-checkboxes__hint">
           You&#39;ll have an account if you&#39;ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-and-none.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-and-none.html
index 0ac6e3636..739e0c53e 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-and-none.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-and-none.html
@@ -6,30 +6,31 @@
       </h1>
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none" name="with-divider-and-none" type="checkbox" value="animal">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none" name="with-divider-and-none" type="checkbox" value="animal">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none">
           Waste from animal carcasses
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-2" name="with-divider-and-none" type="checkbox" value="mines">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-2" name="with-divider-and-none" type="checkbox" value="mines">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-2">
           Waste from mines or quarries
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-3" name="with-divider-and-none" type="checkbox" value="farm">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-3" name="with-divider-and-none" type="checkbox" value="farm">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-3">
           Farm or agricultural waste
         </label>
-            </div>
-            <div class="govuk-checkboxes__divider">or</div>          <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-5" name="with-divider-and-none" type="checkbox" value="none" data-behaviour="exclusive">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-5">
+      </div>
+      <div class="govuk-checkboxes__divider">or</div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-5" name="with-divider-and-none" type="checkbox" value="none" data-behaviour="exclusive">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-5">
           None of these
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-none-and-conditional-items.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-none-and-conditional-items.html
index e290cdfc4..3da71354d 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-none-and-conditional-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-divider-none-and-conditional-items.html
@@ -6,41 +6,41 @@
       </h1>
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items" name="with-divider-and-none-and-conditional-items" type="checkbox" value="accessible-toilets">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items" name="with-divider-and-none-and-conditional-items" type="checkbox" value="accessible-toilets">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items">
           Accessible toilets available
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-2" name="with-divider-and-none-and-conditional-items" type="checkbox" value="braille">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-2" name="with-divider-and-none-and-conditional-items" type="checkbox" value="braille">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-2">
           Braille translation service available
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-3" name="with-divider-and-none-and-conditional-items" type="checkbox" value="disabled-car-parking">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-3" name="with-divider-and-none-and-conditional-items" type="checkbox" value="disabled-car-parking">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-3">
           Disabled car parking available
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-4" name="with-divider-and-none-and-conditional-items" type="checkbox" value="another-access-need" data-aria-controls="conditional-with-divider-and-none-and-conditional-items-4">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-4">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-4" name="with-divider-and-none-and-conditional-items" type="checkbox" value="another-access-need" data-aria-controls="conditional-with-divider-and-none-and-conditional-items-4">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-4">
           Another access need
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-with-divider-and-none-and-conditional-items-4">
-                <label class="govuk-label" for="other-access-needs">Other access needs</label>
-  <textarea class="govuk-textarea govuk-!-width-one-third" name="other-access-needs" id="other-access-needs"></textarea>
-  
-              </div>
-            <div class="govuk-checkboxes__divider">or</div>          <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-6" name="with-divider-and-none-and-conditional-items" type="checkbox" value="none" data-behaviour="exclusive">
-              <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-6">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-with-divider-and-none-and-conditional-items-4">
+        <label class="govuk-label" for="other-access-needs">Other access needs</label>
+        <textarea class="govuk-textarea govuk-!-width-one-third" name="other-access-needs" id="other-access-needs"></textarea>
+      </div>
+      <div class="govuk-checkboxes__divider">or</div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-divider-and-none-and-conditional-items-6" name="with-divider-and-none-and-conditional-items" type="checkbox" value="none" data-behaviour="exclusive">
+        <label class="govuk-label govuk-checkboxes__label" for="with-divider-and-none-and-conditional-items-6">
           None of these
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message-and-hints-on-items.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message-and-hints-on-items.html
index 9d62538b6..e619d76de 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message-and-hints-on-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message-and-hints-on-items.html
@@ -7,33 +7,33 @@
       <span class="govuk-visually-hidden">Error:</span> Please select an option
     </p>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal" aria-describedby="waste-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="waste">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal" aria-describedby="waste-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="waste">
           Waste from animal carcasses
         </label>
-              <div id="waste-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="waste-item-hint" class="govuk-hint govuk-checkboxes__hint">
           Nullam id dolor id nibh ultricies vehicula ut id elit.
         </div>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines" aria-describedby="waste-2-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines" aria-describedby="waste-2-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-2">
           Waste from mines or quarries
         </label>
-              <div id="waste-2-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="waste-2-item-hint" class="govuk-hint govuk-checkboxes__hint">
           Nullam id dolor id nibh ultricies vehicula ut id elit.
         </div>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm" aria-describedby="waste-3-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm" aria-describedby="waste-3-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-3">
           Farm or agricultural waste
         </label>
-              <div id="waste-3-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="waste-3-item-hint" class="govuk-hint govuk-checkboxes__hint">
           Nullam id dolor id nibh ultricies vehicula ut id elit.
         </div>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message.html
index 8fceda7e6..9f647150c 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-error-message.html
@@ -7,24 +7,24 @@
       <span class="govuk-visually-hidden">Error:</span> Please select an option
     </p>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
-              <label class="govuk-label govuk-checkboxes__label" for="waste">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
+        <label class="govuk-label govuk-checkboxes__label" for="waste">
           Waste from animal carcasses
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-2">
           Waste from mines or quarries
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-3">
           Farm or agricultural waste
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-fieldset-and-error-message.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-fieldset-and-error-message.html
index 95282a7bc..958b859b7 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-fieldset-and-error-message.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-fieldset-and-error-message.html
@@ -7,24 +7,24 @@
       <span class="govuk-visually-hidden">Error:</span> Please accept the terms and conditions
     </p>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality">
           British
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
           Irish
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
-              <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
+        <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
           Citizen of another country
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-hints-on-items.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-hints-on-items.html
index 8ec5a772f..9405d3a78 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-hints-on-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-hints-on-items.html
@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="government-gateway" name="gateway" type="checkbox" value="gov-gateway" aria-describedby="government-gateway-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="government-gateway">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="government-gateway" name="gateway" type="checkbox" value="gov-gateway" aria-describedby="government-gateway-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="government-gateway">
           Sign in with Government Gateway
         </label>
-              <div id="government-gateway-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="government-gateway-item-hint" class="govuk-hint govuk-checkboxes__hint">
           You&#39;ll have a user ID if you&#39;ve registered for Self Assessment or filed a tax return online before.
         </div>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="govuk-verify" name="verify" type="checkbox" value="gov-verify" aria-describedby="govuk-verify-item-hint">
-              <label class="govuk-label govuk-checkboxes__label" for="govuk-verify">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="govuk-verify" name="verify" type="checkbox" value="gov-verify" aria-describedby="govuk-verify-item-hint">
+        <label class="govuk-label govuk-checkboxes__label" for="govuk-verify">
           Sign in with GOV.UK Verify
         </label>
-              <div id="govuk-verify-item-hint" class="govuk-hint govuk-checkboxes__hint">
+        <div id="govuk-verify-item-hint" class="govuk-hint govuk-checkboxes__hint">
           You&#39;ll have an account if you&#39;ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-id-and-name.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-id-and-name.html
index 3b2de2bff..22463a34e 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-id-and-name.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-id-and-name.html
@@ -7,24 +7,24 @@
       If you have dual nationality, select all options that are relevant to you.
     </div>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="item_british" name="british" type="checkbox" value="yes">
-              <label class="govuk-label govuk-checkboxes__label" for="item_british">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="item_british" name="british" type="checkbox" value="yes">
+        <label class="govuk-label govuk-checkboxes__label" for="item_british">
           British
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="item_irish" name="irish" type="checkbox" value="irish">
-              <label class="govuk-label govuk-checkboxes__label" for="item_irish">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="item_irish" name="irish" type="checkbox" value="irish">
+        <label class="govuk-label govuk-checkboxes__label" for="item_irish">
           Irish
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="with-id-and-name-3" name="custom-name-scottish" type="checkbox" value="scottish">
-              <label class="govuk-label govuk-checkboxes__label" for="with-id-and-name-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="with-id-and-name-3" name="custom-name-scottish" type="checkbox" value="scottish">
+        <label class="govuk-label govuk-checkboxes__label" for="with-id-and-name-3">
           Scottish
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-legend-as-a-page-heading.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-legend-as-a-page-heading.html
index 6f1385744..327130df4 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-legend-as-a-page-heading.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-legend-as-a-page-heading.html
@@ -9,24 +9,24 @@
       Select all that apply
     </div>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
-              <label class="govuk-label govuk-checkboxes__label" for="waste">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="animal">
+        <label class="govuk-label govuk-checkboxes__label" for="waste">
           Waste from animal carcasses
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="mines">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-2">
           Waste from mines or quarries
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="farm">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-3">
           Farm or agricultural waste
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-optional-form-group-classes-showing-group-error.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-optional-form-group-classes-showing-group-error.html
index 9d6ced625..1f0aea023 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-optional-form-group-classes-showing-group-error.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-optional-form-group-classes-showing-group-error.html
@@ -4,40 +4,37 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked" name="how-contacted-checked" type="checkbox" value="email" data-aria-controls="conditional-how-contacted-checked">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked" name="how-contacted-checked" type="checkbox" value="email" data-aria-controls="conditional-how-contacted-checked">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked">
           Email
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked">
-                <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked-2" name="how-contacted-checked" type="checkbox" value="phone" checked data-aria-controls="conditional-how-contacted-checked-2">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-2">
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked-2" name="how-contacted-checked" type="checkbox" value="phone" checked data-aria-controls="conditional-how-contacted-checked-2">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-2">
           Phone
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional" id="conditional-how-contacted-checked-2">
-                <label class="govuk-label" for="contact-phone">Phone number</label>
-  <span id="contact-phone-error" class="govuk-error-message">Problem with input</span>
-  <input class="govuk-input govuk-input--error govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone" aria-describedby="contact-phone-error">
-  
-              </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="how-contacted-checked-3" name="how-contacted-checked" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-checked-3">
-              <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-3">
+      </div>
+      <div class="govuk-checkboxes__conditional" id="conditional-how-contacted-checked-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <span id="contact-phone-error" class="govuk-error-message">Problem with input</span>
+        <input class="govuk-input govuk-input--error govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone" aria-describedby="contact-phone-error">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="how-contacted-checked-3" name="how-contacted-checked" type="checkbox" value="text" data-aria-controls="conditional-how-contacted-checked-3">
+        <label class="govuk-label govuk-checkboxes__label" for="how-contacted-checked-3">
           Text message
         </label>
-            </div>
-              <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-3">
-                <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-              </div>
+      </div>
+      <div class="govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden" id="conditional-how-contacted-checked-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-pre-checked-values.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-pre-checked-values.html
index 76cafda17..8a4d87a99 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-pre-checked-values.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-pre-checked-values.html
@@ -1,31 +1,30 @@
 <div class="govuk-form-group">
   <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british" checked>
-            <label class="govuk-label govuk-checkboxes__label" for="nationality">
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality" name="nationality" type="checkbox" value="british" checked>
+      <label class="govuk-label govuk-checkboxes__label" for="nationality">
         British
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
-            <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
+      <label class="govuk-label govuk-checkboxes__label" for="nationality-2">
         Irish
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other" checked data-aria-controls="conditional-nationality-3">
-            <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other" checked data-aria-controls="conditional-nationality-3">
+      <label class="govuk-label govuk-checkboxes__label" for="nationality-3">
         Citizen of another country
       </label>
-          </div>
-            <div class="govuk-checkboxes__conditional" id="conditional-nationality-3">
-              <div class="govuk-form-group">
-  <label class="govuk-label" for="other-country">
-    Country
-  </label>
-  <input class="govuk-input" id="other-country" name="other-country" type="text" value="Ravka">
-</div>
-
-            </div>
+    </div>
+    <div class="govuk-checkboxes__conditional" id="conditional-nationality-3">
+      <div class="govuk-form-group">
+        <label class="govuk-label" for="other-country">
+          Country
+        </label>
+        <input class="govuk-input" id="other-country" name="other-country" type="text" value="Ravka">
+      </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-and-hint-set-aria-describedby-on-input.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-and-hint-set-aria-describedby-on-input.html
index fa82f108c..dcdc8d36a 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-and-hint-set-aria-describedby-on-input.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-and-hint-set-aria-describedby-on-input.html
@@ -3,14 +3,14 @@
     <span class="govuk-visually-hidden">Error:</span> Please accept the terms and conditions
   </p>
   <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="t-and-c-with-hint" name="t-and-c-with-hint" type="checkbox" value="yes" aria-describedby="t-and-c-with-hint-error t-and-c-with-hint-item-hint">
-            <label class="govuk-label govuk-checkboxes__label" for="t-and-c-with-hint">
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="t-and-c-with-hint" name="t-and-c-with-hint" type="checkbox" value="yes" aria-describedby="t-and-c-with-hint-error t-and-c-with-hint-item-hint">
+      <label class="govuk-label govuk-checkboxes__label" for="t-and-c-with-hint">
         I agree to the terms and conditions
       </label>
-            <div id="t-and-c-with-hint-item-hint" class="govuk-hint govuk-checkboxes__hint">
+      <div id="t-and-c-with-hint-item-hint" class="govuk-hint govuk-checkboxes__hint">
         Go on, you know you want to!
       </div>
-          </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-set-aria-describedby-on-input.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-set-aria-describedby-on-input.html
index c8454f77f..93a3947e5 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-set-aria-describedby-on-input.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-single-option-set-aria-describedby-on-input.html
@@ -3,11 +3,11 @@
     <span class="govuk-visually-hidden">Error:</span> Please accept the terms and conditions
   </p>
   <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="t-and-c" name="t-and-c" type="checkbox" value="yes" aria-describedby="t-and-c-error">
-            <label class="govuk-label govuk-checkboxes__label" for="t-and-c">
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="t-and-c" name="t-and-c" type="checkbox" value="yes" aria-describedby="t-and-c-error">
+      <label class="govuk-label govuk-checkboxes__label" for="t-and-c">
         I agree to the terms and conditions
       </label>
-          </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-very-long-option-text.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-very-long-option-text.html
index 693962b58..b91f27003 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-very-long-option-text.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-with-very-long-option-text.html
@@ -10,24 +10,24 @@
       <span class="govuk-visually-hidden">Error:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.
     </p>
     <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="nullam">
-              <label class="govuk-label govuk-checkboxes__label" for="waste">
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste" name="waste" type="checkbox" value="nullam">
+        <label class="govuk-label govuk-checkboxes__label" for="waste">
           Nullam id dolor id nibh ultricies vehicula ut id elit. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum. Donec id elit non mi porta gravida at eget metus.
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="aenean">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-2">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-2" name="waste" type="checkbox" value="aenean">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-2">
           Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet fermentum.
         </label>
-            </div>
-            <div class="govuk-checkboxes__item">
-              <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="fusce">
-              <label class="govuk-label govuk-checkboxes__label" for="waste-3">
+      </div>
+      <div class="govuk-checkboxes__item">
+        <input class="govuk-checkboxes__input" id="waste-3" name="waste" type="checkbox" value="fusce">
+        <label class="govuk-label govuk-checkboxes__label" for="waste-3">
           Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Etiam porta sem malesuada magna mollis euismod. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Sed posuere consectetur est at lobortis.
         </label>
-            </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-without-fieldset.html b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-without-fieldset.html
index 1d971531f..b997143ba 100644
--- a/packages/govuk-frontend/dist/govuk/components/checkboxes/template-without-fieldset.html
+++ b/packages/govuk-frontend/dist/govuk/components/checkboxes/template-without-fieldset.html
@@ -1,22 +1,22 @@
 <div class="govuk-form-group">
   <div class="govuk-checkboxes" data-module="govuk-checkboxes">
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="colours" name="colours" type="checkbox" value="red">
-            <label class="govuk-label govuk-checkboxes__label" for="colours">
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="colours" name="colours" type="checkbox" value="red">
+      <label class="govuk-label govuk-checkboxes__label" for="colours">
         Red
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
-            <label class="govuk-label govuk-checkboxes__label" for="colours-2">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
+      <label class="govuk-label govuk-checkboxes__label" for="colours-2">
         Green
       </label>
-          </div>
-          <div class="govuk-checkboxes__item">
-            <input class="govuk-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue">
-            <label class="govuk-label govuk-checkboxes__label" for="colours-3">
+    </div>
+    <div class="govuk-checkboxes__item">
+      <input class="govuk-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue">
+      <label class="govuk-label govuk-checkboxes__label" for="colours-3">
         Blue
       </label>
-          </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-default.html b/packages/govuk-frontend/dist/govuk/components/radios/template-default.html
index 8118294cc..cf857a953 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-default.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-default.html
@@ -3,17 +3,17 @@
     This includes changing your last name or spelling your name differently.
   </div>
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
-          <label class="govuk-label govuk-radios__label" for="example-default">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
+      <label class="govuk-label govuk-radios__label" for="example-default">
         Yes
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no">
-          <label class="govuk-label govuk-radios__label" for="example-default-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no">
+      <label class="govuk-label govuk-radios__label" for="example-default-2">
         No
       </label>
-        </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-inline.html b/packages/govuk-frontend/dist/govuk/components/radios/template-inline.html
index 5c66f681f..00188a85e 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-inline.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-inline.html
@@ -7,18 +7,18 @@
       This includes changing your last name or spelling your name differently.
     </div>
     <div class="govuk-radios govuk-radios--inline" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
-            <label class="govuk-label govuk-radios__label" for="example">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
+        <label class="govuk-label govuk-radios__label" for="example">
           Yes
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
-            <label class="govuk-label govuk-radios__label" for="example-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
+        <label class="govuk-label govuk-radios__label" for="example-2">
           No
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked-using-value.html b/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked-using-value.html
index ab06b5508..dfaae8eef 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked-using-value.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked-using-value.html
@@ -1,16 +1,16 @@
 <div class="govuk-form-group">
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
-          <label class="govuk-label govuk-radios__label" for="example-default">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
+      <label class="govuk-label govuk-radios__label" for="example-default">
         Yes
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no" checked>
-          <label class="govuk-label govuk-radios__label" for="example-default-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no" checked>
+      <label class="govuk-label govuk-radios__label" for="example-default-2">
         No
       </label>
-        </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked.html b/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked.html
index ec5aaabf8..dee670486 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-prechecked.html
@@ -3,17 +3,17 @@
     This includes changing your last name or spelling your name differently.
   </div>
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
-          <label class="govuk-label govuk-radios__label" for="example-default">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default" name="example-default" type="radio" value="yes">
+      <label class="govuk-label govuk-radios__label" for="example-default">
         Yes
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no" checked>
-          <label class="govuk-label govuk-radios__label" for="example-default-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-default-2" name="example-default" type="radio" value="no" checked>
+      <label class="govuk-label govuk-radios__label" for="example-default-2">
         No
       </label>
-        </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline-extreme.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline-extreme.html
index fb1b4215a..d9507812e 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline-extreme.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline-extreme.html
@@ -4,66 +4,66 @@
       Sort by
     </legend>
     <div class="govuk-radios govuk-radios--small govuk-radios--inline" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort" name="example" type="radio" value="relevance">
-            <label class="govuk-label govuk-radios__label" for="sort">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort" name="example" type="radio" value="relevance">
+        <label class="govuk-label govuk-radios__label" for="sort">
           relevance
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-2" name="example" type="radio" value="title">
-            <label class="govuk-label govuk-radios__label" for="sort-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-2" name="example" type="radio" value="title">
+        <label class="govuk-label govuk-radios__label" for="sort-2">
           title
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-3" name="example" type="radio" value="created">
-            <label class="govuk-label govuk-radios__label" for="sort-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-3" name="example" type="radio" value="created">
+        <label class="govuk-label govuk-radios__label" for="sort-3">
           created
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-4" name="example" type="radio" value="modified">
-            <label class="govuk-label govuk-radios__label" for="sort-4">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-4" name="example" type="radio" value="modified">
+        <label class="govuk-label govuk-radios__label" for="sort-4">
           modified
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-5" name="example" type="radio" value="category">
-            <label class="govuk-label govuk-radios__label" for="sort-5">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-5" name="example" type="radio" value="category">
+        <label class="govuk-label govuk-radios__label" for="sort-5">
           category
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-6" name="example" type="radio" value="votes">
-            <label class="govuk-label govuk-radios__label" for="sort-6">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-6" name="example" type="radio" value="votes">
+        <label class="govuk-label govuk-radios__label" for="sort-6">
           votes
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-7" name="example" type="radio" value="flavour">
-            <label class="govuk-label govuk-radios__label" for="sort-7">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-7" name="example" type="radio" value="flavour">
+        <label class="govuk-label govuk-radios__label" for="sort-7">
           flavour
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-8" name="example" type="radio" value="hue">
-            <label class="govuk-label govuk-radios__label" for="sort-8">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-8" name="example" type="radio" value="hue">
+        <label class="govuk-label govuk-radios__label" for="sort-8">
           hue
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-9" name="example" type="radio" value="happiness">
-            <label class="govuk-label govuk-radios__label" for="sort-9">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-9" name="example" type="radio" value="happiness">
+        <label class="govuk-label govuk-radios__label" for="sort-9">
           happiness
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-10" name="example" type="radio" value="funkiness">
-            <label class="govuk-label govuk-radios__label" for="sort-10">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-10" name="example" type="radio" value="funkiness">
+        <label class="govuk-label govuk-radios__label" for="sort-10">
           funkiness
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline.html
index 0141fe554..f5b41df60 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-inline.html
@@ -4,24 +4,24 @@
       Sort by
     </legend>
     <div class="govuk-radios govuk-radios--small govuk-radios--inline" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort" name="example" type="radio" value="relevance">
-            <label class="govuk-label govuk-radios__label" for="sort">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort" name="example" type="radio" value="relevance">
+        <label class="govuk-label govuk-radios__label" for="sort">
           relevance
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-2" name="example" type="radio" value="title">
-            <label class="govuk-label govuk-radios__label" for="sort-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-2" name="example" type="radio" value="title">
+        <label class="govuk-label govuk-radios__label" for="sort-2">
           title
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="sort-3" name="example" type="radio" value="created">
-            <label class="govuk-label govuk-radios__label" for="sort-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="sort-3" name="example" type="radio" value="created">
+        <label class="govuk-label govuk-radios__label" for="sort-3">
           created
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-a-divider.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-a-divider.html
index ac21d122c..225c559a0 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-a-divider.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-a-divider.html
@@ -4,24 +4,25 @@
       How do you want to sign in?
     </legend>
     <div class="govuk-radios govuk-radios--small" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-small-divider" name="example" type="radio" value="governement-gateway">
-            <label class="govuk-label govuk-radios__label" for="example-small-divider">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-small-divider" name="example" type="radio" value="governement-gateway">
+        <label class="govuk-label govuk-radios__label" for="example-small-divider">
           Use Government Gateway
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-small-divider-2" name="example" type="radio" value="govuk-verify">
-            <label class="govuk-label govuk-radios__label" for="example-small-divider-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-small-divider-2" name="example" type="radio" value="govuk-verify">
+        <label class="govuk-label govuk-radios__label" for="example-small-divider-2">
           Use GOV.UK Verify
         </label>
-          </div>
-          <div class="govuk-radios__divider">or</div>        <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-small-divider-4" name="example" type="radio" value="create-account">
-            <label class="govuk-label govuk-radios__label" for="example-small-divider-4">
+      </div>
+      <div class="govuk-radios__divider">or</div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-small-divider-4" name="example" type="radio" value="create-account">
+        <label class="govuk-label govuk-radios__label" for="example-small-divider-4">
           Create an account
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-conditional-reveal.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-conditional-reveal.html
index c120c875f..505c754be 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-conditional-reveal.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-conditional-reveal.html
@@ -4,29 +4,28 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
-              <label class="govuk-label" for="context-email">Foo</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="context-email">Foo</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-disabled.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-disabled.html
index 16cb03f75..f8d79dcee 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-disabled.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-disabled.html
@@ -4,24 +4,24 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" disabled>
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" disabled>
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-error.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-error.html
index fc5ae2511..806845537 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-error.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-error.html
@@ -7,24 +7,24 @@
       <span class="govuk-visually-hidden">Error:</span> Select a thing
     </p>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-hint.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-hint.html
index eeaa9efa7..054f15107 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-hint.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-hint.html
@@ -4,27 +4,27 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" aria-describedby="how-contacted-2-item-hint">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" aria-describedby="how-contacted-2-item-hint">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-            <div id="how-contacted-2-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="how-contacted-2-item-hint" class="govuk-hint govuk-radios__hint">
           Hint for email address
         </div>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-long-text.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-long-text.html
index e639341b7..8ed559425 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-long-text.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small-with-long-text.html
@@ -4,24 +4,24 @@
       Venenatis Condimentum
     </legend>
     <div class="govuk-radios govuk-radios--small" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="foo" name="foo" type="radio" value="nullam">
-            <label class="govuk-label govuk-radios__label" for="foo">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="foo" name="foo" type="radio" value="nullam">
+        <label class="govuk-label govuk-radios__label" for="foo">
           Nullam id dolor id nibh ultricies vehicula ut id elit. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum. Donec id elit non mi porta gravida at eget metus.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="foo-2" name="foo" type="radio" value="aenean">
-            <label class="govuk-label govuk-radios__label" for="foo-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="foo-2" name="foo" type="radio" value="aenean">
+        <label class="govuk-label govuk-radios__label" for="foo-2">
           Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet fermentum.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="foo-3" name="foo" type="radio" value="fusce">
-            <label class="govuk-label govuk-radios__label" for="foo-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="foo-3" name="foo" type="radio" value="fusce">
+        <label class="govuk-label govuk-radios__label" for="foo-3">
           Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Etiam porta sem malesuada magna mollis euismod. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Sed posuere consectetur est at lobortis.
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-small.html b/packages/govuk-frontend/dist/govuk/components/radios/template-small.html
index 9b2c1c67d..f26bbc0d7 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-small.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-small.html
@@ -4,24 +4,24 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-divider.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-divider.html
index e2e83d30f..900adf69d 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-divider.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-divider.html
@@ -4,24 +4,25 @@
       How do you want to sign in?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-divider" name="example" type="radio" value="governement-gateway">
-            <label class="govuk-label govuk-radios__label" for="example-divider">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-divider" name="example" type="radio" value="governement-gateway">
+        <label class="govuk-label govuk-radios__label" for="example-divider">
           Use Government Gateway
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-divider-2" name="example" type="radio" value="govuk-verify">
-            <label class="govuk-label govuk-radios__label" for="example-divider-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-divider-2" name="example" type="radio" value="govuk-verify">
+        <label class="govuk-label govuk-radios__label" for="example-divider-2">
           Use GOV.UK Verify
         </label>
-          </div>
-          <div class="govuk-radios__divider">or</div>        <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-divider-4" name="example" type="radio" value="create-account">
-            <label class="govuk-label govuk-radios__label" for="example-divider-4">
+      </div>
+      <div class="govuk-radios__divider">or</div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-divider-4" name="example" type="radio" value="create-account">
+        <label class="govuk-label govuk-radios__label" for="example-divider-4">
           Create an account
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-medium-legend.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-medium-legend.html
index e18d07cfb..8aaca80f1 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-medium-legend.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-a-medium-legend.html
@@ -7,18 +7,18 @@
       Select one of the options below.
     </div>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
-            <label class="govuk-label govuk-radios__label" for="housing-act">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
+        <label class="govuk-label govuk-radios__label" for="housing-act">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 2 of the Housing Act 2004</span> For properties that are 3 or more stories high and occupied by 5 or more people
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
-            <label class="govuk-label govuk-radios__label" for="housing-act-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
+        <label class="govuk-label govuk-radios__label" for="housing-act-2">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 3 of the Housing Act 2004</span> For properties that are within a geographical area defined by a local council
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-item-checked.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-item-checked.html
index 33a0e8391..d3509936d 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-item-checked.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-item-checked.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked" name="how-contacted-checked" type="radio" value="email" checked data-aria-controls="conditional-how-contacted-checked">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked" name="how-contacted-checked" type="radio" value="email" checked data-aria-controls="conditional-how-contacted-checked">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional" id="conditional-how-contacted-checked">
-              <label class="govuk-label" for="context-email">Email</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked-2" name="how-contacted-checked" type="radio" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked-2">
+      </div>
+      <div class="govuk-radios__conditional" id="conditional-how-contacted-checked">
+        <label class="govuk-label" for="context-email">Email</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked-2" name="how-contacted-checked" type="radio" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked-3" name="how-contacted-checked" type="radio" value="text" data-aria-controls="conditional-how-contacted-checked-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked-3">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked-3" name="how-contacted-checked" type="radio" value="text" data-aria-controls="conditional-how-contacted-checked-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-and-pre-checked-value.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-and-pre-checked-value.html
index 5265dab67..3662df259 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-and-pre-checked-value.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-and-pre-checked-value.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked" name="how-contacted-checked" type="radio" value="email" data-aria-controls="conditional-how-contacted-checked">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked" name="how-contacted-checked" type="radio" value="email" data-aria-controls="conditional-how-contacted-checked">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked">
-              <label class="govuk-label" for="context-email">Email</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked-2" name="how-contacted-checked" type="radio" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked-2">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked">
+        <label class="govuk-label" for="context-email">Email</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked-2" name="how-contacted-checked" type="radio" value="phone" data-aria-controls="conditional-how-contacted-checked-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-checked-3" name="how-contacted-checked" type="radio" value="text" checked data-aria-controls="conditional-how-contacted-checked-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-checked-3">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-checked-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-checked-3" name="how-contacted-checked" type="radio" value="text" checked data-aria-controls="conditional-how-contacted-checked-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-checked-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional" id="conditional-how-contacted-checked-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
+      <div class="govuk-radios__conditional" id="conditional-how-contacted-checked-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-with-special-characters.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-with-special-characters.html
index 17a6a73c7..b217675d5 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-with-special-characters.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items-with-special-characters.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="user.profile[contact-prefs]" name="contact-prefs" type="radio" value="email" data-aria-controls="conditional-user.profile[contact-prefs]">
-            <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="user.profile[contact-prefs]" name="contact-prefs" type="radio" value="email" data-aria-controls="conditional-user.profile[contact-prefs]">
+        <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]">
-              <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="user.profile[contact-prefs]-2" name="contact-prefs" type="radio" value="phone" data-aria-controls="conditional-user.profile[contact-prefs]-2">
-            <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]-2">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="user.profile[contact-prefs]-2" name="contact-prefs" type="radio" value="phone" data-aria-controls="conditional-user.profile[contact-prefs]-2">
+        <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="user.profile[contact-prefs]-3" name="contact-prefs" type="radio" value="text" data-aria-controls="conditional-user.profile[contact-prefs]-3">
-            <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]-3">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="user.profile[contact-prefs]-3" name="contact-prefs" type="radio" value="text" data-aria-controls="conditional-user.profile[contact-prefs]-3">
+        <label class="govuk-label govuk-radios__label" for="user.profile[contact-prefs]-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-user.profile[contact-prefs]-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items.html
index 3035fa80a..dc6230f9b 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-conditional-items.html
@@ -4,39 +4,36 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted" name="how-contacted" type="radio" value="email" data-aria-controls="conditional-how-contacted">
-            <label class="govuk-label govuk-radios__label" for="how-contacted">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted" name="how-contacted" type="radio" value="email" data-aria-controls="conditional-how-contacted">
+        <label class="govuk-label govuk-radios__label" for="how-contacted">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted">
-              <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted" type="radio" value="phone" data-aria-controls="conditional-how-contacted-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted" type="radio" value="phone" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-3" name="how-contacted" type="radio" value="text" data-aria-controls="conditional-how-contacted-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-3">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-3" name="how-contacted" type="radio" value="text" data-aria-controls="conditional-how-contacted-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-disabled.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-disabled.html
index 1b29c589f..84f23b6e5 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-disabled.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-disabled.html
@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
-            <label class="govuk-label govuk-radios__label" for="gateway">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
+        <label class="govuk-label govuk-radios__label" for="gateway">
           Sign in with Government Gateway
         </label>
-            <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have a user ID if you’ve registered for Self Assessment or filed a tax return online before.
         </div>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" disabled aria-describedby="verify-item-hint">
-            <label class="govuk-label govuk-radios__label" for="verify">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" disabled aria-describedby="verify-item-hint">
+        <label class="govuk-label govuk-radios__label" for="verify">
           Sign in with GOV.UK Verify
         </label>
-            <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-fieldset-and-error-message.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-fieldset-and-error-message.html
index c2751f08c..e81fc39bc 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-fieldset-and-error-message.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-fieldset-and-error-message.html
@@ -7,18 +7,18 @@
       <span class="govuk-visually-hidden">Error:</span> Please select an option
     </p>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
-            <label class="govuk-label govuk-radios__label" for="example">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example" name="example" type="radio" value="yes">
+        <label class="govuk-label govuk-radios__label" for="example">
           Yes
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
-            <label class="govuk-label govuk-radios__label" for="example-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="example-2" name="example" type="radio" value="no" checked>
+        <label class="govuk-label govuk-radios__label" for="example-2">
           No
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-hints-on-items.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-hints-on-items.html
index 695d21d2c..581951835 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-hints-on-items.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-hints-on-items.html
@@ -6,24 +6,24 @@
       </h1>
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
-            <label class="govuk-label govuk-radios__label" for="gateway">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="gateway" name="gov" type="radio" value="gateway" aria-describedby="gateway-item-hint">
+        <label class="govuk-label govuk-radios__label" for="gateway">
           Sign in with Government Gateway
         </label>
-            <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="gateway-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have a user ID if you’ve registered for Self Assessment or filed a tax return online before.
         </div>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" aria-describedby="verify-item-hint">
-            <label class="govuk-label govuk-radios__label" for="verify">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="verify" name="gov" type="radio" value="verify" aria-describedby="verify-item-hint">
+        <label class="govuk-label govuk-radios__label" for="verify">
           Sign in with GOV.UK Verify
         </label>
-            <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
+        <div id="verify-item-hint" class="govuk-hint govuk-radios__hint">
           You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.
         </div>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-idprefix.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-idprefix.html
index 94613b000..514b1d977 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-idprefix.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-idprefix.html
@@ -1,16 +1,16 @@
 <div class="govuk-form-group">
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-id-prefix" name="example-radio" type="radio" value="yes">
-          <label class="govuk-label govuk-radios__label" for="example-id-prefix">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-id-prefix" name="example-radio" type="radio" value="yes">
+      <label class="govuk-label govuk-radios__label" for="example-id-prefix">
         Yes
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="example-id-prefix-2" name="example-radio" type="radio" value="no">
-          <label class="govuk-label govuk-radios__label" for="example-id-prefix-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="example-id-prefix-2" name="example-radio" type="radio" value="no">
+      <label class="govuk-label govuk-radios__label" for="example-id-prefix-2">
         No
       </label>
-        </div>
+    </div>
   </div>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-legend-as-page-heading.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-legend-as-page-heading.html
index 748d16a70..65b6113f8 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-legend-as-page-heading.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-legend-as-page-heading.html
@@ -9,18 +9,18 @@
       Select one of the options below.
     </div>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
-            <label class="govuk-label govuk-radios__label" for="housing-act">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act" name="housing-act" type="radio" value="part-2">
+        <label class="govuk-label govuk-radios__label" for="housing-act">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 2 of the Housing Act 2004</span> For properties that are 3 or more stories high and occupied by 5 or more people
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
-            <label class="govuk-label govuk-radios__label" for="housing-act-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="housing-act-2" name="housing-act" type="radio" value="part-3">
+        <label class="govuk-label govuk-radios__label" for="housing-act-2">
           <span class="govuk-heading-s govuk-!-margin-bottom-1">Part 3 of the Housing Act 2004</span> For properties that are within a geographical area defined by a local council
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-optional-form-group-classes-showing-group-error.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-optional-form-group-classes-showing-group-error.html
index 6ec7521e2..c3c196ac2 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-optional-form-group-classes-showing-group-error.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-optional-form-group-classes-showing-group-error.html
@@ -4,40 +4,37 @@
       How do you want to be contacted?
     </legend>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2" name="how-contacted-2" type="radio" value="email" data-aria-controls="conditional-how-contacted-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2">
           Email
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
-              <label class="govuk-label" for="context-email">Email address</label>
-  <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone" checked data-aria-controls="conditional-how-contacted-2-2">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2">
+        <label class="govuk-label" for="context-email">Email address</label>
+        <input class="govuk-input govuk-!-width-one-third" name="context-email" type="text" id="context-email">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-2" name="how-contacted-2" type="radio" value="phone" checked data-aria-controls="conditional-how-contacted-2-2">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-2">
           Phone
         </label>
-          </div>
-            <div class="govuk-radios__conditional" id="conditional-how-contacted-2-2">
-              <label class="govuk-label" for="contact-phone">Phone number</label>
-  <span id="contact-phone-error" class="govuk-error-message">Problem with input</span>
-  <input class="govuk-input govuk-input--error govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone" aria-describedby="contact-phone-error">
-  
-            </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" data-aria-controls="conditional-how-contacted-2-3">
-            <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
+      </div>
+      <div class="govuk-radios__conditional" id="conditional-how-contacted-2-2">
+        <label class="govuk-label" for="contact-phone">Phone number</label>
+        <span id="contact-phone-error" class="govuk-error-message">Problem with input</span>
+        <input class="govuk-input govuk-input--error govuk-!-width-one-third" name="contact-phone" type="text" id="contact-phone" aria-describedby="contact-phone-error">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="how-contacted-2-3" name="how-contacted-2" type="radio" value="text" data-aria-controls="conditional-how-contacted-2-3">
+        <label class="govuk-label govuk-radios__label" for="how-contacted-2-3">
           Text message
         </label>
-          </div>
-            <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2-3">
-              <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
-  <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
-  
-            </div>
+      </div>
+      <div class="govuk-radios__conditional govuk-radios__conditional--hidden" id="conditional-how-contacted-2-3">
+        <label class="govuk-label" for="contact-text-message">Mobile phone number</label>
+        <input class="govuk-input govuk-!-width-one-third" name="contact-text-message" type="text" id="contact-text-message">
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-with-very-long-option-text.html b/packages/govuk-frontend/dist/govuk/components/radios/template-with-very-long-option-text.html
index b038ee925..0b7932a45 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-with-very-long-option-text.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-with-very-long-option-text.html
@@ -10,24 +10,24 @@
       <span class="govuk-visually-hidden">Error:</span> Lorem ipsum dolor sit amet, consectetur adipiscing elit.
     </p>
     <div class="govuk-radios" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste" name="waste" type="radio" value="nullam">
-            <label class="govuk-label govuk-radios__label" for="waste">
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste" name="waste" type="radio" value="nullam">
+        <label class="govuk-label govuk-radios__label" for="waste">
           Nullam id dolor id nibh ultricies vehicula ut id elit. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Maecenas faucibus mollis interdum. Donec id elit non mi porta gravida at eget metus.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste-2" name="waste" type="radio" value="aenean">
-            <label class="govuk-label govuk-radios__label" for="waste-2">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste-2" name="waste" type="radio" value="aenean">
+        <label class="govuk-label govuk-radios__label" for="waste-2">
           Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Donec sed odio dui. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Cras mattis consectetur purus sit amet fermentum.
         </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" id="waste-3" name="waste" type="radio" value="fusce">
-            <label class="govuk-label govuk-radios__label" for="waste-3">
+      </div>
+      <div class="govuk-radios__item">
+        <input class="govuk-radios__input" id="waste-3" name="waste" type="radio" value="fusce">
+        <label class="govuk-label govuk-radios__label" for="waste-3">
           Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Etiam porta sem malesuada magna mollis euismod. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. Sed posuere consectetur est at lobortis.
         </label>
-          </div>
+      </div>
     </div>
   </fieldset>
 </div>
diff --git a/packages/govuk-frontend/dist/govuk/components/radios/template-without-fieldset.html b/packages/govuk-frontend/dist/govuk/components/radios/template-without-fieldset.html
index 2899827e3..77edadcec 100644
--- a/packages/govuk-frontend/dist/govuk/components/radios/template-without-fieldset.html
+++ b/packages/govuk-frontend/dist/govuk/components/radios/template-without-fieldset.html
@@ -1,22 +1,22 @@
 <div class="govuk-form-group">
   <div class="govuk-radios" data-module="govuk-radios">
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours" name="colours" type="radio" value="red">
-          <label class="govuk-label govuk-radios__label" for="colours">
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours" name="colours" type="radio" value="red">
+      <label class="govuk-label govuk-radios__label" for="colours">
         Red
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours-2" name="colours" type="radio" value="green">
-          <label class="govuk-label govuk-radios__label" for="colours-2">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours-2" name="colours" type="radio" value="green">
+      <label class="govuk-label govuk-radios__label" for="colours-2">
         Green
       </label>
-        </div>
-        <div class="govuk-radios__item">
-          <input class="govuk-radios__input" id="colours-3" name="colours" type="radio" value="blue">
-          <label class="govuk-label govuk-radios__label" for="colours-3">
+    </div>
+    <div class="govuk-radios__item">
+      <input class="govuk-radios__input" id="colours-3" name="colours" type="radio" value="blue">
+      <label class="govuk-label govuk-radios__label" for="colours-3">
         Blue
       </label>
-        </div>
+    </div>
   </div>
 </div>

Action run for 8b1b5aa

@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 26, 2024 •
edited
Loading

Other changes to npm package

The diff could not be posted as a comment. You can download it from the workflow artifacts.

Action run for 8b1b5aa

@colinrotherham colinrotherham force-pushed the nunjucks-formatting-errors branch from faf934a to 74d326a Compare February 1, 2024 11:27
Base automatically changed from nunjucks-formatting-errors to main February 1, 2024 11:37
@colinrotherham colinrotherham force-pushed the nunjucks-formatting-radios-checkboxes branch from d31b81c to 95eb0e6 Compare February 1, 2024 11:42
@colinrotherham colinrotherham force-pushed the nunjucks-formatting-radios-checkboxes branch from 95eb0e6 to a06b431 Compare February 8, 2024 21:25
@colinrotherham colinrotherham force-pushed the nunjucks-formatting-radios-checkboxes branch from a06b431 to 8b1b5aa Compare February 8, 2024 21:34
@govuk-design-system-ci govuk-design-system-ci temporarily deployed to govuk-frontend-pr-4676 February 8, 2024 21:35 Inactive
romaricpascal
romaricpascal approved these changes Feb 13, 2024
View reviewed changes
Copy link
Member

@romaricpascal romaricpascal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! ⛵

@colinrotherham colinrotherham merged commit 83eaffa into main Feb 13, 2024
45 checks passed
@colinrotherham colinrotherham deleted the nunjucks-formatting-radios-checkboxes branch February 13, 2024 09:57
@RichardBradley
Copy link

Adding indents to the app-supplied html in radio conditional items breaks our app, because multi-line values inside our <textarea>s inside conditional expandos now have extra whitespace added to them, corrupting user input.

The line in question is here, but I suspect this may cause similar issues elsewhere:
6955db3#r139105666

What was the need that this change solved?
Can this part (or more) be reverted? It seems risky to be changing app supplied HTML in this way

This was referenced Feb 27, 2024
Closed
Open
owenatgov pushed a commit that referenced this pull request Apr 4, 2024
@colinrotherham
Merge pull request #4676 from alphagov/nunjucks-formatting-radios-che…
57be38e 
…ckboxes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@romaricpascal romaricpascal romaricpascal approved these changes

Assignees
No one assigned
Labels
nunjucks
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Review use indent in our templates
4 participants
@colinrotherham @RichardBradley @romaricpascal @govuk-design-system-ci