Revert "Change checkboxes to GOVUK frontend"

app/assets/javascripts/collapsibleCheckboxes.js

@@ -5,7 +5,7 @@
 
   function Summary (module) {
     this.module = module;
-    this.$el = module.$formGroup.find('.selection-summary').first();
+    this.$el = module.$formGroup.find('.selection-summary');
     this.fieldLabel = module.fieldLabel;
     this.total = module.total;
     this.addContent();
@@ -25,7 +25,6 @@
     if (this.fieldLabel === 'folder') { this.$text.addClass('selection-summary__text--folders'); }
 
     this.$el.append(this.$text);
-    this.module.$formGroup.find('.govuk-hint').remove();
   };
   Summary.prototype.update = function(selection) {
     let template;
@@ -87,13 +86,12 @@
       .focus();
   };
   CollapsibleCheckboxes.prototype.start = function(component) {
-    this.$component = $(component);
-    this.$formGroup = this.$component.find('.govuk-form-group').first();
-    this.$fieldset = this.$formGroup.find('fieldset').first();
+    this.$formGroup = $(component);
+    this.$fieldset = this.$formGroup.find('fieldset');
     this.$checkboxes = this.$fieldset.find('input[type=checkbox]');
-    this.fieldLabel = this.$component.data('fieldLabel');
+    this.fieldLabel = this.$formGroup.data('fieldLabel');
     this.total = this.$checkboxes.length;
-    this.legendText = this.$fieldset.find('legend').first().text().trim();
+    this.legendText = this.$fieldset.find('legend').text().trim();
     this.expanded = false;
 
     this.addHeadingHideLegend();
@@ -115,7 +113,7 @@
   };
   CollapsibleCheckboxes.prototype.getSelection = function() { return this.$checkboxes.filter(':checked').length; };
   CollapsibleCheckboxes.prototype.addHeadingHideLegend = function() {
-    const headingLevel = this.$component.data('heading-level') || '2';
+    const headingLevel = this.$formGroup.data('heading-level') || '2';
 
     this.$heading = $(`<h${headingLevel} class="heading-small">${this.legendText}</h${headingLevel}>`);
     this.$fieldset.before(this.$heading);

app/assets/stylesheets/components/checkboxes.scss

@@ -1,7 +1,3 @@
-// Taken from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/checkboxes/_checkboxes.scss
-$govuk-touch-target-size: 44px;
-$govuk-checkboxes-size: 40px;
-
 .selection-summary {
 
   .selection-summary__text {
@@ -69,30 +65,6 @@ $govuk-checkboxes-size: 40px;
 
 }
 
-.govuk-form-group--nested {
-
-  $border-thickness: $govuk-touch-target-size - $govuk-checkboxes-size;
-  $border-indent: $govuk-touch-target-size / 2;
-
-  position: relative;
-
-  // To equalise the spacing between the line and the top/bottom of
-  // the radio
-  margin-top: govuk-spacing(1) + ($border-thickness / 2);
-  margin-bottom: govuk-spacing(1) * -1;
-  padding-left: govuk-spacing(2) + 2;
-
-  &:before {
-    content: "";
-    position: absolute;
-    bottom: 0;
-    left: $border-indent * -1;
-    width: $border-thickness;
-    height: 100%;
-    background: $govuk-border-colour;
-  }
-}
-
 .selection-content {
   margin-bottom: govuk-spacing(4);
 

app/assets/stylesheets/components/message.scss

@@ -24,9 +24,6 @@
   }
 }
 
-$message-text-left-spacing: 22px;
-$message-type-bottom-spacing: govuk-spacing(4);
-
 .message {
 
   &-name {
@@ -66,18 +63,39 @@ $message-type-bottom-spacing: govuk-spacing(4);
   }
 
   &-type {
-    color: $govuk-secondary-text-colour;
-    margin: 0 0 $message-type-bottom-spacing 0;
-    padding-left: 0;
+    color: $secondary-text-colour;
+    margin: 0 0 govuk-spacing(4) 0;
     pointer-events: none;
   }
 
 }
 
+#template-list {
+
+  margin-top: govuk-spacing(6);
+
+  &.top-gutter-5px {
+    margin-top: 5px;
+  }
+
+}
+
 .template-list {
 
   &-item {
 
+    &-with-checkbox {
+
+      position: relative;
+      padding-left: govuk-spacing(9);
+
+      .multiple-choice {
+        position: absolute;
+        left: 0;
+      }
+
+    }
+
     &-hidden-by-default {
       display: none;
     }
@@ -105,22 +123,6 @@ $message-type-bottom-spacing: govuk-spacing(4);
 
     }
 
-    &-hint,
-    &-label {
-      padding-left: $message-text-left-spacing;
-    }
-
-    &-label {
-      padding-top: 0px;
-      padding-bottom: 0px;
-    }
-
-    // Fix for GOVUK Frontend selector with high precendence
-    // https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/hint/_hint.scss
-    &-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl)+.template-list-item-hint {
-      margin-bottom: $message-type-bottom-spacing;
-    }
-
   }
 
   &-folder {

app/assets/stylesheets/govuk-frontend/_all.scss

@@ -26,7 +26,6 @@ $govuk-assets-path: "/static/";
 @import 'components/button/_button';
 @import 'components/details/_details';
 @import 'components/radios/_radios';
-@import 'components/checkboxes/_checkboxes';
 
 @import "utilities/all";
 @import "overrides/all";