Merge pull request #1222 from alphagov/toolkit-upgrade

Upgrade GOV.UK Template, Frontend Tookit, and Elements

app/assets/stylesheets/app.scss

@@ -46,8 +46,7 @@
 }
 
 .beta-badge {
-  @include phase-tag(beta);
-  background: $govuk-blue;
+  @include phase-tag();
   margin: 10px 0 0 0;
 }
 
@@ -151,22 +150,10 @@ td {
   margin-bottom: 5px;
 }
 
-a[rel='external'] {
-  @include external-link-default;
-  @include external-link-16;
-  @include media(tablet) {
-    @include external-link-19;
-  }
-}
-
 .hint {
   color: $secondary-text-colour;
 }
 
-.button {
-  padding: 0.3em 0.6em 0.2em 0.6em;
-}
-
 .list-bullet {
 
   .list-bullet {
@@ -256,10 +243,16 @@ details .arrow {
   margin-top: 5px;
 }
 
-.block-label input[disabled] {
-  opacity: 0.5;
-}
-
 #content.override-elements-content {
   padding-bottom: 0;
 }
+
+.multiple-choice input:disabled+label {
+  opacity: 1;
+  color: $secondary-text-colour;
+  cursor: default;
+}
+
+.multiple-choice input:disabled {
+  opacity: 0.5;
+}

app/assets/stylesheets/components/radio-select.scss

@@ -5,19 +5,25 @@
     display: inline-block;
     vertical-align: top;
 
-    .block-label {
+    .multiple-choice {
       margin-right: 5px;
-      padding-right: $gutter - 10px;
+      padding-right: 10px;
       padding-left: 54px - 10px;
     }
 
   }
 
-  .tertiary-button {
+  .js-reset-button,
+  .js-category-button {
+    background: none;
+    text-decoration: underline;
+    color: $link-colour;
+    //font-weight: bold;
+    border: none;
     display: inline-block;
     vertical-align: top;
     width: auto;
-    padding: 20px $gutter-half 15px $gutter-half;
+    padding: 7px 20px 7px 10px;
     margin-right: 5px;
   }
 
@@ -26,12 +32,12 @@
     height: 60px;
     overflow: visible;
 
-    .block-label {
+    .multiple-choice {
       display: none;
     }
 
-    .js-block-label {
-      display: inline-block;
+    .js-multiple-choice {
+      display: block;
     }
 
   }

app/assets/stylesheets/main.scss

@@ -24,7 +24,7 @@ $path: '/static/images/';
 @import 'elements/elements-typography';
 @import 'elements/forms';
 @import 'elements/forms/form-validation';
-@import 'elements/forms/form-block-labels';
+@import 'elements/forms/form-multiple-choice';
 @import 'elements/forms/form-validation';
 @import 'elements/icons';
 @import 'elements/layout';