Merge pull request #1566 from alphagov/release-v3.2.0

Release v3.2.0

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.2.0 (Feature release)
+
 ### New features
 
 #### Add classes to the form group wrapper of the character count component

dist/VERSION.txt

@@ -1 +1 @@
-3.1.0
+3.2.0

package/govuk/components/button/_button.scss

@@ -98,6 +98,17 @@
       box-shadow: inset 0 0 0 1px $govuk-focus-colour;
     }
 
+    // alphagov/govuk_template includes a specific a:link:focus selector
+    // designed to make unvisited links a slightly darker blue when focussed, so
+    // we need to override the text colour for that combination of selectors so
+    // so that unvisited links styled as buttons do not end up with dark blue
+    // text when focussed.
+    @include govuk-compatibility(govuk_template) {
+      &:link:focus {
+        color: $govuk-button-text-colour;
+      }
+    }
+
     &:focus:not(:active):not(:hover) {
       border-color: $govuk-focus-colour;
       color: $govuk-focus-text-colour;

package/govuk/components/character-count/macro-options.json

@@ -62,6 +62,20 @@
         "description": "Options for the errorMessage component (e.g. text).",
         "isComponent": true
     },
+    {
+        "name": "formGroup",
+        "type": "object",
+        "required": false,
+        "description": "Options for the form-group wrapper",
+        "params": [
+            {
+                "name": "classes",
+                "type": "string",
+                "required": false,
+                "description": "Classes to add to the form group (e.g. to show error state for the whole group)"
+            }
+        ]
+    },
     {
         "name": "classes",
         "type": "string",

package/govuk/components/character-count/template.njk

@@ -10,6 +10,7 @@
     describedBy: params.id + '-info',
     rows: params.rows,
     value: params.value,
+    formGroup: params.formGroup,
     classes: 'govuk-js-character-count ' + (' govuk-textarea--error' if params.errorMessage) + (params.classes if params.classes),
     label: {
       html: params.label.html,

package/govuk/components/fieldset/_fieldset.scss

@@ -32,8 +32,6 @@
     max-width: 100%;        // 1
     margin-bottom: govuk-spacing(2);
     padding: 0;
-    // Hack to let legends or elements within legends have margins in webkit browsers
-    overflow: hidden;
 
     white-space: normal;    // 1
   }

package/govuk/components/summary-list/macro-options.json

@@ -5,6 +5,12 @@
         "required": true,
         "description": "Array of row item objects.",
         "params": [
+            {
+                "name": "classes",
+                "type": "string",
+                "required": false,
+                "description": "Classes to add to the row `div`"
+            },
             {
                 "name": "key.text",
                 "type": "string",

package/govuk/helpers/_font-faces.scss

@@ -15,26 +15,28 @@
 /// @access private
 
 @mixin _govuk-font-face-gds-transport {
-  @include govuk-exports("govuk/helpers/font-faces") {
-    @at-root {
-      /*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */
+  @include govuk-not-ie8 { // In IE8, which cannot render WOFF format, we fall back to system fonts
+    @include govuk-exports("govuk/helpers/font-faces") {
+      @at-root {
+        /*! Copyright (c) 2011 by Margaret Calvert & Henrik Kubel. All rights reserved. The font has been customised for exclusive use on gov.uk. This cut is not commercially available. */
 
-      @font-face {
-        font-family: "GDS Transport";
-        src: govuk-font-url("light-94a07e06a1-v2.woff2") format("woff2"),
-             govuk-font-url("light-f591b13f7d-v2.woff") format("woff");
-        font-weight: normal;
-        font-style: normal;
-        font-display: fallback;
-      }
+        @font-face {
+          font-family: "GDS Transport";
+          src: govuk-font-url("light-94a07e06a1-v2.woff2") format("woff2"),
+               govuk-font-url("light-f591b13f7d-v2.woff") format("woff");
+          font-weight: normal;
+          font-style: normal;
+          font-display: fallback;
+        }
 
-      @font-face {
-        font-family: "GDS Transport";
-        src: govuk-font-url("bold-b542beb274-v2.woff2") format("woff2"),
-             govuk-font-url("bold-affa96571d-v2.woff") format("woff");
-        font-weight: bold;
-        font-style: normal;
-        font-display: fallback;
+        @font-face {
+          font-family: "GDS Transport";
+          src: govuk-font-url("bold-b542beb274-v2.woff2") format("woff2"),
+               govuk-font-url("bold-affa96571d-v2.woff") format("woff");
+          font-weight: bold;
+          font-style: normal;
+          font-display: fallback;
+        }
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "govuk-frontend",
   "description": "GOV.UK Frontend contains the code you need to start building a user interface for government platforms and services.",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "main": "govuk/all.js",
   "sass": "govuk/all.scss",
   "engines": {