govuk_frontend_toolkit 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22fafcc6055ff4474250ffa6304e94a4fbf03cab
-  data.tar.gz: 176d0192da328ee83432ccbf0f13abc190e697f9
+  metadata.gz: 675e5847b8fe55142c8bfcdc1a44b89859ebb6b2
+  data.tar.gz: acd7680a1f6626db9a45ea97d89ee5c08f06a944
 SHA512:
-  metadata.gz: bb15be95deff5e46b16035a0ec6fa09dc68930cd579c61b75fa8b922ad5e6ead4cab08decdb742d032b73fbc6faef3ca636baec439cccada1e77671cc573275a
-  data.tar.gz: 976d6e1c3fa4d311e3dd7bf17c3cf483315a120d98c15f83205e98fc29afe5e634d725193415e55547a040bef13bfaa59062d70f441f0ecf634e525a1e0b6df1
+  metadata.gz: a57923a7ddf0097e51eae6eb258cd19512265c43fbfc04f85dc536569effb3e1a69ecb7f47aec3aaead323cf43903abc8c0a0fad6a3da21bbf3d4b5f5193f7bc
+  data.tar.gz: 9177483203d92473543c6f0e71e81d8075955c42b7e38b4d0f19e4268013c9345c66442fdafb2e5c9e790ebe440cf90044832d2b109c08c63eb0da5e3b65e763

data/app/assets/.gitignore

@@ -1,5 +1,5 @@
 node_modules/
 .sass-cache
 npm-debug.log
-spec/stylesheets
+spec/stylesheets/test*
 _SpecRunner.html

data/app/assets/.travis.yml

@@ -2,9 +2,6 @@ sudo: false
 language: node_js
 node_js:
   - "0.10"
-env:
-  global:
-    secure: "15QWA6igmMx1I2YlDrdkxsOi2YJIWNrXmgEtfEoCWR7eJQW2bkUDdzTXYFzxaEPIVMEgO+0pxfGwMWn/9MBhnXCLu9x0f0KqJ/0YfCGXHW21g8J+31zypdiCiw/Ir/dxazP9wpvWFhuqjo9X35zP3Md7TC8u+20uW2Q5KUVyqZM="
 before_install:
   - openssl aes-256-cbc -K $encrypted_909ac1036a94_key -iv $encrypted_909ac1036a94_iv -in .travis/govuk_frontend_toolkit_push.enc -out ~/.ssh/id_rsa -d
   - chmod 600 ~/.ssh/id_rsa

data/app/assets/.travis/README.md

@@ -16,8 +16,9 @@ is the only way we can find that Travis can trigger another job.
 In this case, the downstream jobs publish the frontend toolkit to npm
 and RubyGems.
 
-The `env.global.secure` in `/.travis.yml` contains a Travis token that
-belongs to [@alexmuller](https://github.com/alexmuller) - as far as we
+The [Travis settings](https://travis-ci.org/alphagov/govuk_frontend_toolkit/settings)
+contains a Travis token that belongs to
+[@alexmuller](https://github.com/alexmuller) - as far as we
 can tell there's no way to generate one of these that isn't related to
 a specific user. This token could be replaced with a generic bot account
 if we created one.

data/app/assets/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 5.1.1
+
+- Update the alpha, beta and discovery colours to $govuk-blue to match the updated phase banner ([PR #370](https://github.com/alphagov/govuk_frontend_toolkit/pull/370))
+- Fix radio button show/hide behaviour when used outside a form ([PR #375](https://github.com/alphagov/govuk_frontend_toolkit/pull/375))
+- Fix a "Stick at top when scrolling" component bug related to scroll anchoring in Chrome 56+ ([PR #376](https://github.com/alphagov/govuk_frontend_toolkit/pull/376))
+- Minor travis fixes ([PR #373](https://github.com/alphagov/govuk_frontend_toolkit/pull/373))
+
 # 5.1.0
 
 - Allow custom options when tracking events ([PR #365](https://github.com/alphagov/govuk_frontend_toolkit/pull/365))

data/app/assets/Gruntfile.js

@@ -16,6 +16,8 @@ module.exports = function (grunt) {
     }
   )
 
+  allSassFiles.push("@import '_colour_contrast_spec.scss';")
+
   grunt.file.write(
     './spec/stylesheets/test.scss',
     allSassFiles.join('\n')
@@ -46,7 +48,9 @@ module.exports = function (grunt) {
         },
         options: {
           loadPath: [
-            './stylesheets'
+            './node_modules',
+            './stylesheets',
+            './spec/stylesheets'
           ],
           style: 'nested'
         }

data/app/assets/VERSION.txt

@@ -1 +1 @@
-5.1.0
+5.1.1

data/app/assets/javascripts/govuk/show-hide-content.js

@@ -80,7 +80,8 @@
     function handleRadioContent ($control, $content) {
       // All radios in this group which control content
       var selector = selectors.radio + '[name=' + escapeElementName($control.attr('name')) + '][aria-controls]'
-      var $radios = $control.closest('form').find(selector)
+      var $form = $control.closest('form')
+      var $radios = $form.length ? $form.find(selector) : $(selector)
 
       // Hide content for radios in group
       $radios.each(function () {

data/app/assets/javascripts/govuk/stick-at-top-when-scrolling.js

@@ -110,8 +110,9 @@
       if (!$el.hasClass('content-fixed')) {
         $el.data('scrolled-from', sticky.getElementOffset($el).top)
         var height = Math.max($el.height(), 1)
-        $el.before('<div class="shim" style="width: ' + $el.width() + 'px; height: ' + height + 'px">&nbsp;</div>')
-        $el.css('width', $el.width() + 'px').addClass('content-fixed')
+        var width = $el.width()
+        $el.before('<div class="shim" style="width: ' + width + 'px; height: ' + height + 'px">&nbsp;</div>')
+        $el.css('width', width + 'px').addClass('content-fixed')
       }
     },
     release: function ($el) {

data/app/assets/package.json

@@ -9,7 +9,8 @@
     "grunt-contrib-jasmine": "^1.0.0",
     "grunt-contrib-sass": "0.7.4",
     "jquery": "~1.12.4",
-    "standard": "^8.2.0"
+    "standard": "^8.2.0",
+    "sass-color-helpers": "^2.0.3"
   },
   "scripts": {
     "test": "grunt test && npm run lint --silent",

data/app/assets/spec/stylesheets/_colour_contrast_spec.scss

@@ -0,0 +1,12 @@
+@import "colours/organisation";
+@import "sass-color-helpers/stylesheets/color-helpers/math";
+@import "sass-color-helpers/stylesheets/color-helpers/contrast";
+
+@each $organisation in $all-organisation-brand-colours {
+  $minimum-contrast: 4.5;
+  $contrast: ch-color-contrast($white, nth($organisation, 3));
+
+  @if ($contrast < $minimum-contrast) {
+    @error "Contrast ratio for #{nth($organisation, 1)} too low. #{nth($organisation, 3)} on #{$white} has a contrast of: #{$contrast}. Must be higher than #{$minimum-contrast} for WCAG AA support";
+  }
+}

data/app/assets/spec/unit/show-hide-content.spec.js

@@ -6,66 +6,6 @@ describe('show-hide-content', function () {
   'use strict'
   var GOVUK = window.GOVUK
 
-  beforeEach(function () {
-    // Sample markup
-    this.$content = $(
-
-      // Radio buttons (yes/no)
-      '<form>' +
-      '<label class="block-label" data-target="show-hide-radios">' +
-      '<input type="radio" name="single" value="no">' +
-      'Yes' +
-      '</label>' +
-      '<label class="block-label">' +
-      '<input type="radio" name="single" value="yes">' +
-      'No' +
-      '</label>' +
-      '<div id="show-hide-radios" class="panel js-hidden" />' +
-      '</form>' +
-
-      // Checkboxes (multiple values)
-      '<form>' +
-      '<label class="block-label" data-target="show-hide-checkboxes">' +
-      '<input type="checkbox" name="multiple[option1]">' +
-      'Option 1' +
-      '</label>' +
-      '<label class="block-label">' +
-      '<input type="checkbox" name="multiple[option2]">' +
-      'Option 2' +
-      '</label>' +
-      '<label class="block-label">' +
-      '<input type="checkbox" name="multiple[option3]">' +
-      'Option 3' +
-      '</label>' +
-      '<div id="show-hide-checkboxes" class="panel js-hidden" />' +
-      '</form>'
-    )
-
-    // Find radios/checkboxes
-    var $radios = this.$content.find('input[type=radio]')
-    var $checkboxes = this.$content.find('input[type=checkbox]')
-
-    // Two radios
-    this.$radio1 = $radios.eq(0)
-    this.$radio2 = $radios.eq(1)
-
-    // Three checkboxes
-    this.$checkbox1 = $checkboxes.eq(0)
-    this.$checkbox2 = $checkboxes.eq(1)
-    this.$checkbox3 = $checkboxes.eq(2)
-
-    // Add to page
-    $(document.body).append(this.$content)
-
-    // Show/Hide content
-    this.$radioShowHide = $('#show-hide-radios')
-    this.$checkboxShowHide = $('#show-hide-checkboxes')
-
-    // Add show/hide content support
-    this.showHideContent = new GOVUK.ShowHideContent()
-    this.showHideContent.init()
-  })
-
   afterEach(function () {
     if (this.showHideContent) {
       this.showHideContent.destroy()
@@ -74,176 +14,293 @@ describe('show-hide-content', function () {
     this.$content.remove()
   })
 
-  describe('when this.showHideContent = new GOVUK.ShowHideContent() is called', function () {
-    it('should add the aria attributes to inputs with show/hide content', function () {
-      expect(this.$radio1.attr('aria-expanded')).toBe('false')
-      expect(this.$radio1.attr('aria-controls')).toBe('show-hide-radios')
-    })
-
-    it('should add the aria attributes to show/hide content', function () {
-      expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
-      expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
-    })
-
-    it('should hide the show/hide content visually', function () {
-      expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
-    })
-
-    it('should do nothing if no radios are checked', function () {
-      expect(this.$radio1.attr('aria-expanded')).toBe('false')
-      expect(this.$radio2.attr('aria-expanded')).toBe(undefined)
-    })
-
-    it('should do nothing if no checkboxes are checked', function () {
-      expect(this.$radio1.attr('aria-expanded')).toBe('false')
-      expect(this.$radio2.attr('aria-expanded')).toBe(undefined)
+  describe('when the radios are inside a form', function () {
+    beforeEach(function () {
+      // Sample markup
+      this.$content = $(
+
+        // Radio buttons (yes/no)
+        '<form>' +
+        '<label class="block-label" data-target="show-hide-radios">' +
+        '<input type="radio" name="single" value="yes">' +
+        'Yes' +
+        '</label>' +
+        '<label class="block-label">' +
+        '<input type="radio" name="single" value="no">' +
+        'No' +
+        '</label>' +
+        '<div id="show-hide-radios" class="panel js-hidden" />' +
+        '</form>' +
+
+        // Checkboxes (multiple values)
+        '<form>' +
+        '<label class="block-label" data-target="show-hide-checkboxes">' +
+        '<input type="checkbox" name="multiple[option1]">' +
+        'Option 1' +
+        '</label>' +
+        '<label class="block-label">' +
+        '<input type="checkbox" name="multiple[option2]">' +
+        'Option 2' +
+        '</label>' +
+        '<label class="block-label">' +
+        '<input type="checkbox" name="multiple[option3]">' +
+        'Option 3' +
+        '</label>' +
+        '<div id="show-hide-checkboxes" class="panel js-hidden" />' +
+        '</form>'
+      )
+
+      // Find radios/checkboxes
+      var $radios = this.$content.find('input[type=radio]')
+      var $checkboxes = this.$content.find('input[type=checkbox]')
+
+      // Two radios
+      this.$radio1 = $radios.eq(0)
+      this.$radio2 = $radios.eq(1)
+
+      // Three checkboxes
+      this.$checkbox1 = $checkboxes.eq(0)
+      this.$checkbox2 = $checkboxes.eq(1)
+      this.$checkbox3 = $checkboxes.eq(2)
+
+      // Add to page
+      $(document.body).append(this.$content)
+
+      // Show/Hide content
+      this.$radioShowHide = $('#show-hide-radios')
+      this.$checkboxShowHide = $('#show-hide-checkboxes')
+
+      // Add show/hide content support
+      this.showHideContent = new GOVUK.ShowHideContent()
+      this.showHideContent.init()
     })
 
-    describe('with non-default markup', function () {
-      beforeEach(function () {
-        this.showHideContent.destroy()
+    describe('and when this.showHideContent = new GOVUK.ShowHideContent() is called', function () {
+      it('should add the aria attributes to inputs with show/hide content', function () {
+        expect(this.$radio1.attr('aria-expanded')).toBe('false')
+        expect(this.$radio1.attr('aria-controls')).toBe('show-hide-radios')
       })
 
-      it('should do nothing if a radio without show/hide content is checked', function () {
-        this.$radio2.prop('checked', true)
-
-        // Defaults changed, initialise again
-        this.showHideContent = new GOVUK.ShowHideContent().init()
-        expect(this.$radio1.attr('aria-expanded')).toBe('false')
+      it('should add the aria attributes to show/hide content', function () {
         expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
         expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
       })
 
-      it('should do nothing if a checkbox without show/hide content is checked', function () {
-        this.$checkbox2.prop('checked', true)
-
-        // Defaults changed, initialise again
-        this.showHideContent = new GOVUK.ShowHideContent().init()
-        expect(this.$checkbox1.attr('aria-expanded')).toBe('false')
-        expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('true')
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(true)
+      it('should hide the show/hide content visually', function () {
+        expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
       })
 
-      it('should do nothing if checkboxes without show/hide content is checked', function () {
-        this.$checkbox2.prop('checked', true)
-        this.$checkbox3.prop('checked', true)
-
-        // Defaults changed, initialise again
-        this.showHideContent = new GOVUK.ShowHideContent().init()
-        expect(this.$checkbox1.attr('aria-expanded')).toBe('false')
-        expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('true')
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(true)
+      it('should do nothing if no radios are checked', function () {
+        expect(this.$radio1.attr('aria-expanded')).toBe('false')
+        expect(this.$radio2.attr('aria-expanded')).toBe(undefined)
       })
 
-      it('should make the show/hide content visible if its radio is checked', function () {
-        this.$radio1.prop('checked', true)
-
-        // Defaults changed, initialise again
-        this.showHideContent = new GOVUK.ShowHideContent().init()
-        expect(this.$radio1.attr('aria-expanded')).toBe('true')
-        expect(this.$radioShowHide.attr('aria-hidden')).toBe('false')
-        expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+      it('should do nothing if no checkboxes are checked', function () {
+        expect(this.$radio1.attr('aria-expanded')).toBe('false')
+        expect(this.$radio2.attr('aria-expanded')).toBe(undefined)
       })
 
-      it('should make the show/hide content visible if its checkbox is checked', function () {
-        this.$checkbox1.prop('checked', true)
-
-        // Defaults changed, initialise again
-        this.showHideContent = new GOVUK.ShowHideContent().init()
-        expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
-        expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+      describe('with non-default markup', function () {
+        beforeEach(function () {
+          this.showHideContent.destroy()
+        })
+
+        it('should do nothing if a radio without show/hide content is checked', function () {
+          this.$radio2.prop('checked', true)
+
+          // Defaults changed, initialise again
+          this.showHideContent = new GOVUK.ShowHideContent().init()
+          expect(this.$radio1.attr('aria-expanded')).toBe('false')
+          expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
+          expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
+        })
+
+        it('should do nothing if a checkbox without show/hide content is checked', function () {
+          this.$checkbox2.prop('checked', true)
+
+          // Defaults changed, initialise again
+          this.showHideContent = new GOVUK.ShowHideContent().init()
+          expect(this.$checkbox1.attr('aria-expanded')).toBe('false')
+          expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('true')
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(true)
+        })
+
+        it('should do nothing if checkboxes without show/hide content is checked', function () {
+          this.$checkbox2.prop('checked', true)
+          this.$checkbox3.prop('checked', true)
+
+          // Defaults changed, initialise again
+          this.showHideContent = new GOVUK.ShowHideContent().init()
+          expect(this.$checkbox1.attr('aria-expanded')).toBe('false')
+          expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('true')
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(true)
+        })
+
+        it('should make the show/hide content visible if its radio is checked', function () {
+          this.$radio1.prop('checked', true)
+
+          // Defaults changed, initialise again
+          this.showHideContent = new GOVUK.ShowHideContent().init()
+          expect(this.$radio1.attr('aria-expanded')).toBe('true')
+          expect(this.$radioShowHide.attr('aria-hidden')).toBe('false')
+          expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+        })
+
+        it('should make the show/hide content visible if its checkbox is checked', function () {
+          this.$checkbox1.prop('checked', true)
+
+          // Defaults changed, initialise again
+          this.showHideContent = new GOVUK.ShowHideContent().init()
+          expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
+          expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+        })
       })
-    })
 
-    describe('and a show/hide radio receives a click', function () {
-      it('should make the show/hide content visible', function () {
-        this.$radio1.click()
-        expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+      describe('and a show/hide radio receives a click', function () {
+        it('should make the show/hide content visible', function () {
+          this.$radio1.click()
+          expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+        })
+
+        it('should add the aria attributes to show/hide content', function () {
+          this.$radio1.click()
+          expect(this.$radio1.attr('aria-expanded')).toBe('true')
+          expect(this.$radioShowHide.attr('aria-hidden')).toBe('false')
+          expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+        })
       })
 
-      it('should add the aria attributes to show/hide content', function () {
-        this.$radio1.click()
-        expect(this.$radio1.attr('aria-expanded')).toBe('true')
-        expect(this.$radioShowHide.attr('aria-hidden')).toBe('false')
-        expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
+      describe('and a show/hide checkbox receives a click', function () {
+        it('should make the show/hide content visible', function () {
+          this.$checkbox1.click()
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+        })
+
+        it('should add the aria attributes to show/hide content', function () {
+          this.$checkbox1.click()
+          expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
+          expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+        })
       })
-    })
 
-    describe('and a show/hide checkbox receives a click', function () {
-      it('should make the show/hide content visible', function () {
-        this.$checkbox1.click()
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+      describe('and a show/hide radio receives a click, but another group radio is clicked afterwards', function () {
+        it('should make the show/hide content hidden', function () {
+          this.$radio1.click()
+          this.$radio2.click()
+          expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
+        })
+
+        it('should add the aria attributes to show/hide content', function () {
+          this.$radio1.click()
+          this.$radio2.click()
+          expect(this.$radio1.attr('aria-expanded')).toBe('false')
+          expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
+        })
       })
 
-      it('should add the aria attributes to show/hide content', function () {
-        this.$checkbox1.click()
-        expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
-        expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+      describe('and a show/hide checkbox receives a click, but another checkbox is clicked afterwards', function () {
+        it('should keep the show/hide content visible', function () {
+          this.$checkbox1.click()
+          this.$checkbox2.click()
+          expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+        })
+
+        it('should keep the aria attributes to show/hide content', function () {
+          this.$checkbox1.click()
+          this.$checkbox2.click()
+          expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
+          expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
+        })
       })
     })
 
-    describe('and a show/hide radio receives a click, but another group radio is clicked afterwards', function () {
-      it('should make the show/hide content hidden', function () {
-        this.$radio1.click()
-        this.$radio2.click()
-        expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
-      })
-
-      it('should add the aria attributes to show/hide content', function () {
-        this.$radio1.click()
-        this.$radio2.click()
-        expect(this.$radio1.attr('aria-expanded')).toBe('false')
-        expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
+    describe('before this.showHideContent.destroy() is called', function () {
+      it('document.body should have show/hide event handlers', function () {
+        var events = $._data(document.body, 'events')
+        expect(events && events.click).toContain(jasmine.objectContaining({
+          namespace: 'ShowHideContent',
+          selector: 'input[type="radio"][name="single"]'
+        }))
+        expect(events && events.click).toContain(jasmine.objectContaining({
+          namespace: 'ShowHideContent',
+          selector: '.block-label[data-target] input[type="checkbox"]'
+        }))
       })
     })
 
-    describe('and a show/hide checkbox receives a click, but another checkbox is clicked afterwards', function () {
-      it('should keep the show/hide content visible', function () {
-        this.$checkbox1.click()
-        this.$checkbox2.click()
-        expect(this.$checkboxShowHide.hasClass('js-hidden')).toEqual(false)
+    describe('and when this.showHideContent.destroy() is called', function () {
+      beforeEach(function () {
+        this.showHideContent.destroy()
       })
 
-      it('should keep the aria attributes to show/hide content', function () {
-        this.$checkbox1.click()
-        this.$checkbox2.click()
-        expect(this.$checkbox1.attr('aria-expanded')).toBe('true')
-        expect(this.$checkboxShowHide.attr('aria-hidden')).toBe('false')
+      it('should have no show/hide event handlers', function () {
+        var events = $._data(document.body, 'events')
+        expect(events && events.click).not.toContain(jasmine.objectContaining({
+          namespace: 'ShowHideContent',
+          selector: 'input[type="radio"][name="single"]'
+        }))
+        expect(events && events.click).not.toContain(jasmine.objectContaining({
+          namespace: 'ShowHideContent',
+          selector: '.block-label[data-target] input[type="checkbox"]'
+        }))
       })
     })
   })
 
-  describe('before this.showHideContent.destroy() is called', function () {
-    it('document.body should have show/hide event handlers', function () {
-      var events = $._data(document.body, 'events')
-      expect(events && events.click).toContain(jasmine.objectContaining({
-        namespace: 'ShowHideContent',
-        selector: 'input[type="radio"][name="single"]'
-      }))
-      expect(events && events.click).toContain(jasmine.objectContaining({
-        namespace: 'ShowHideContent',
-        selector: '.block-label[data-target] input[type="checkbox"]'
-      }))
+  describe('when the radios are outside of a form', function () {
+    beforeEach(function () {
+      // Sample markup
+      this.$content = $(
+        // Radio buttons (yes/no)
+        '<label class="block-label" data-target="show-hide-radios">' +
+        '<input type="radio" name="single" value="yes">' +
+        'Yes' +
+        '</label>' +
+        '<label class="block-label">' +
+        '<input type="radio" name="single" value="no">' +
+        'No' +
+        '</label>' +
+        '<div id="show-hide-radios" class="panel js-hidden" />'
+      )
+
+      // Find radios/checkboxes
+      var $radios = this.$content.find('input[type=radio]')
+
+      // Two radios
+      this.$radio1 = $radios.eq(0)
+      this.$radio2 = $radios.eq(1)
+
+      // Add to page
+      $(document.body).append(this.$content)
+
+      // Show/Hide content
+      this.$radioShowHide = $('#show-hide-radios')
+
+      // Add show/hide content support
+      this.showHideContent = new GOVUK.ShowHideContent()
+      this.showHideContent.init()
     })
-  })
 
-  describe('when this.showHideContent.destroy() is called', function () {
-    beforeEach(function () {
-      this.showHideContent.destroy()
+    it('should make the show/hide content visible if its radio is checked', function () {
+      this.$radio1.click()
+
+      // Defaults changed, initialise again
+      this.showHideContent = new GOVUK.ShowHideContent().init()
+      expect(this.$radio1.attr('aria-expanded')).toBe('true')
+      expect(this.$radioShowHide.attr('aria-hidden')).toBe('false')
+      expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(false)
     })
 
-    it('should have no show/hide event handlers', function () {
-      var events = $._data(document.body, 'events')
-      expect(events && events.click).not.toContain(jasmine.objectContaining({
-        namespace: 'ShowHideContent',
-        selector: 'input[type="radio"][name="single"]'
-      }))
-      expect(events && events.click).not.toContain(jasmine.objectContaining({
-        namespace: 'ShowHideContent',
-        selector: '.block-label[data-target] input[type="checkbox"]'
-      }))
+    it('should do nothing if a radio without show/hide content is checked', function () {
+      this.$radio2.click()
+
+      // Defaults changed, initialise again
+      this.showHideContent = new GOVUK.ShowHideContent().init()
+      expect(this.$radio1.attr('aria-expanded')).toBe('false')
+      expect(this.$radioShowHide.attr('aria-hidden')).toBe('true')
+      expect(this.$radioShowHide.hasClass('js-hidden')).toEqual(true)
     })
   })
 })

data/app/assets/stylesheets/colours/_palette.scss

@@ -68,9 +68,9 @@ $panel-colour: $grey-3;           // Related links panel, page footer etc.
 $canvas-colour: $grey-4;          // Page background
 $highlight-colour: $grey-4;       // Table stripes etc.
 $page-colour: $white;             // The page
-$discovery-colour: $fuschia;      // Discovery badges and banners
-$alpha-colour: $pink;             // Alpha badges and banners
-$beta-colour: $orange;            // Beta badges and banners
+$discovery-colour: $govuk-blue;   // Discovery badges and banners
+$alpha-colour: $govuk-blue;       // Alpha badges and banners
+$beta-colour: $govuk-blue;        // Beta badges and banners
 $live-colour: $grass-green;       // Live badges and banners
 $banner-text-colour: #000;        // Text colour for Alpha & Beta banners
 $error-colour: $red;              // Error text and border colour

data/app/assets/trigger.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 PAYLOAD='{
 "request": {
   "branch": "master"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -239,6 +239,7 @@ files:
 - app/assets/package.json
 - app/assets/push.sh
 - app/assets/spec/manifest.js
+- app/assets/spec/stylesheets/_colour_contrast_spec.scss
 - app/assets/spec/support/LocalTestRunner.html
 - app/assets/spec/support/console-runner.js
 - app/assets/spec/support/load.js