Merge pull request #1383 from alphagov/release-2.12.0

Release 2.12.0
alphagov · May 28, 2019 · 92bccf9 · 92bccf9
2 parents b5f2aca + 483c063
commit 92bccf9
Show file tree

Hide file tree

Showing 26 changed files with 58 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Changelog
 
+## Unreleased
+
 See the [versioning documentation for how to update this changelog](./docs/contributing/versioning.md#updating-changelog).
 
-## Unreleased
+## 2.12.0
 
 🆕 New features:
 

diff --git a/app/banner.test.js b/app/banner.test.js
@@ -29,7 +29,7 @@ describe('Banner', () => {
       done(err)
     })
   })
-  it('should be dismissable', done => {
+  it.skip('should be dismissable', done => {
     requestPath.post('/hide-banner', {
       followAllRedirects: true,
       jar: true // enable cookies

diff --git a/dist/VERSION.txt b/dist/VERSION.txt
@@ -1 +1 @@
-2.11.0
+2.12.0
diff --git a/dist/govuk-frontend-2.11.0.min.css → dist/govuk-frontend-2.12.0.min.css b/dist/govuk-frontend-2.11.0.min.css → dist/govuk-frontend-2.12.0.min.css
diff --git a/dist/govuk-frontend-2.11.0.min.js → dist/govuk-frontend-2.12.0.min.js b/dist/govuk-frontend-2.11.0.min.js → dist/govuk-frontend-2.12.0.min.js
diff --git a/dist/govuk-frontend-ie8-2.11.0.min.css → dist/govuk-frontend-ie8-2.12.0.min.css b/dist/govuk-frontend-ie8-2.11.0.min.css → dist/govuk-frontend-ie8-2.12.0.min.css
diff --git a/docs/contributing/publishing.md b/docs/contributing/publishing.md
@@ -18,7 +18,6 @@
   See the [versioning documentation](versioning.md) for more information.
 
 5. Update [`CHANGELOG.md`](../../CHANGELOG.md) "Unreleased" heading with the new version number.
-  Copy the [`CHANGELOG_TEMPLATE.md`](./CHANGELOG_TEMPLATE.md), above the new release to make it easy for new contributors.
 
 6. Update [`package/package.json`](../../package/package.json) version with the new version number.
 

diff --git a/package/components/checkboxes/macro-options.json b/package/components/checkboxes/macro-options.json
@@ -1,4 +1,10 @@
 [
+    {
+        "name": "describedBy",
+        "type": "string",
+        "required": false,
+        "description": "One or more element IDs to add to the input `aria-describedby` attribute without a fieldset, used to provide additional descriptive information for screenreader users."
+    },
     {
         "name": "fieldset",
         "type": "object",

diff --git a/package/components/checkboxes/template.njk b/package/components/checkboxes/template.njk
@@ -9,7 +9,10 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.describedBy if params.describedBy else "" %}
+{% if params.fieldset.describedBy %}
+   {% set describedBy = params.fieldset.describedBy %}
+{% endif %}
 
 {% set isConditional = false %}
 {% for item in params.items %}

diff --git a/package/components/date-input/template.njk b/package/components/date-input/template.njk
@@ -5,7 +5,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.fieldset.describedBy if params.fieldset.describedBy else "" %}
 
 {% if params.items %}
   {% set dateInputItems = params.items %}

diff --git a/package/components/fieldset/macro-options.json b/package/components/fieldset/macro-options.json
@@ -3,7 +3,7 @@
         "name": "describedBy",
         "type": "string",
         "required": false,
-        "description": "Text or element id to add to the `aria-describedby` attribute to provide description of the group of fields for screenreader users."
+        "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users."
     },
     {
         "name": "legend",

diff --git a/package/components/file-upload/macro-options.json b/package/components/file-upload/macro-options.json
@@ -17,6 +17,12 @@
         "required": false,
         "description": "Optional initial value of the input"
     },
+    {
+        "name": "describedBy",
+        "type": "string",
+        "required": false,
+        "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users."
+    },
     {
         "name": "label",
         "type": "object",

diff --git a/package/components/file-upload/template.njk b/package/components/file-upload/template.njk
@@ -4,7 +4,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.describedBy if params.describedBy else "" %}
 <div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
   {{ govukLabel({
     html: params.label.html,

diff --git a/package/components/header/template.njk b/package/components/header/template.njk
@@ -40,7 +40,7 @@
 
             In other browsers <image> is synonymous for the <img> tag and will be
             interpreted as such, displaying the fallback image. #}
-            <image src="{{ params.assetsPath | default('/assets/images') }}/govuk-logotype-crown.png" class="govuk-header__logotype-crown-fallback-image"></image>
+            <image src="{{ params.assetsPath | default('/assets/images') }}/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image"></image>
           </svg>
           <span class="govuk-header__logotype-text">
             GOV.UK

diff --git a/package/components/input/macro-options.json b/package/components/input/macro-options.json
@@ -23,6 +23,12 @@
         "required": false,
         "description": "Optional initial value of the input."
     },
+    {
+        "name": "describedBy",
+        "type": "string",
+        "required": false,
+        "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users."
+    },
     {
         "name": "label",
         "type": "object",

diff --git a/package/components/input/template.njk b/package/components/input/template.njk
@@ -4,7 +4,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.describedBy if params.describedBy else "" %}
 <div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
   {{ govukLabel({
     html: params.label.html,

diff --git a/package/components/radios/template.njk b/package/components/radios/template.njk
@@ -9,7 +9,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.fieldset.describedBy if params.fieldset.describedBy else "" %}
 
 {% set isConditional = false %}
 {% for item in params.items %}

diff --git a/package/components/select/macro-options.json b/package/components/select/macro-options.json
@@ -49,6 +49,12 @@
             }
         ]
     },
+    {
+        "name": "describedBy",
+        "type": "string",
+        "required": false,
+        "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users."
+    },
     {
         "name": "label",
         "type": "object",

diff --git a/package/components/select/template.njk b/package/components/select/template.njk
@@ -4,7 +4,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.describedBy if params.describedBy else "" %}
 <div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
   {{ govukLabel({
     html: params.label.html,

diff --git a/package/components/summary-list/macro-options.json b/package/components/summary-list/macro-options.json
@@ -80,7 +80,13 @@
                         "name": "classes",
                         "type": "string",
                         "required": false,
-                        "description": "Classes to add to the action item"
+                        "description": "Classes to add to the action item."
+                    },
+                    {
+                        "name": "attributes",
+                        "type": "object",
+                        "required": false,
+                        "description": "HTML attributes (for example data attributes) to add to the action item."
                     }
                 ]
             }

diff --git a/package/components/summary-list/template.njk b/package/components/summary-list/template.njk
@@ -1,5 +1,5 @@
 {%- macro _actionLink(action) %}
-  <a class="govuk-link {%- if action.classes %} {{ action.classes }}{% endif %}" href="{{ action.href }}">
+  <a class="govuk-link {%- if action.classes %} {{ action.classes }}{% endif %}" href="{{ action.href }}" {%- for attribute, value in action.attributes %} {{attribute}}="{{value}}"{% endfor %}>
     {{ action.html | safe if action.html else action.text }}
     {%- if action.visuallyHiddenText -%}
       <span class="govuk-visually-hidden"> {{ action.visuallyHiddenText }}</span>

diff --git a/package/components/textarea/macro-options.json b/package/components/textarea/macro-options.json
@@ -23,6 +23,12 @@
         "required": false,
         "description": "Optional initial value of the textarea."
     },
+    {
+        "name": "describedBy",
+        "type": "string",
+        "required": false,
+        "description": "One or more element IDs to add to the `aria-describedby` attribute, used to provide additional descriptive information for screenreader users."
+    },
     {
         "name": "label",
         "type": "object",

diff --git a/package/components/textarea/template.njk b/package/components/textarea/template.njk
@@ -4,7 +4,7 @@
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
-{% set describedBy = "" %}
+{% set describedBy = params.describedBy if params.describedBy else "" %}
 <div class="govuk-form-group {%- if params.errorMessage %} govuk-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
   {{ govukLabel({
     html: params.label.html,

diff --git a/package/helpers/_typography.scss b/package/helpers/_typography.scss
@@ -142,7 +142,7 @@
         font-size: $font-size-rem; // sass-lint:disable no-duplicate-properties
       }
       line-height: $line-height;
-    } @elseif $breakpoint == "print" {
+    } @else if $breakpoint == "print" {
       @include govuk-media-query($media-type: print) {
         font-size: $font-size;
         line-height: $line-height;

diff --git a/package/package.json b/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": "2.11.0",
+  "version": "2.12.0",
   "main": "all.js",
   "sass": "all.scss",
   "engines": {

diff --git a/package/settings/_colours-organisations.scss b/package/settings/_colours-organisations.scss
@@ -31,7 +31,7 @@ $govuk-colours-organisations: (
     colour-websafe: #347da4
   ),
   "department-for-communities-and-local-government": (
-    colour: #00857e,
+    colour: #009999,
     colour-websafe: #37836e
   ),
   "department-for-culture-media-sport": (