govuk_frontend_toolkit 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 675e5847b8fe55142c8bfcdc1a44b89859ebb6b2
-  data.tar.gz: acd7680a1f6626db9a45ea97d89ee5c08f06a944
+  metadata.gz: 177c21aaa74abca4dfa655928bb2f6742e1e046f
+  data.tar.gz: 2743d40802f0408afcd2618e227f7f22432d8ec2
 SHA512:
-  metadata.gz: a57923a7ddf0097e51eae6eb258cd19512265c43fbfc04f85dc536569effb3e1a69ecb7f47aec3aaead323cf43903abc8c0a0fad6a3da21bbf3d4b5f5193f7bc
-  data.tar.gz: 9177483203d92473543c6f0e71e81d8075955c42b7e38b4d0f19e4268013c9345c66442fdafb2e5c9e790ebe440cf90044832d2b109c08c63eb0da5e3b65e763
+  metadata.gz: 2de75c8841daa62163dc4d7ec1cfa9c7390b897264ee35231bb594db1350b72690d8a1a1093746eb79d2ca33dd8e32d1c14f704d76142d4bc2e6a8f6f6a8b5b6
+  data.tar.gz: 00e6cb4ccb8133885947b119987287667341d0d3ec0bf10d21754cb14ee6d2af79d551fbc0220f8c6e645e93e6b186b2971a08387e23a0732722f7df8d9d3f3a

data/app/assets/.travis.yml

@@ -1,16 +1,19 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
+  - "6.9.5"
 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
+  # Node project, so Ruby dependencies must be installed manually (see `govuk-lint`)
+  - bundle install
   - git config --global user.name "Travis CI"
   - git config --global user.email "travis@travis-ci.org"
   - git remote add origin_ssh git@github.com:alphagov/govuk_frontend_toolkit.git
-  - bundle install
+  # Encrypted SSH config used to `push.sh` to Github (See `.travis/README.md`)
+  - 'if [ "$TRAVIS_PULL_REQUEST_BRANCH" = "master" ]; then 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; fi'
 script:
   - npm test
+before_deploy:
+  - test $TRAVIS_TEST_RESULT = 0
 deploy:
   - provider: script
     script: './push.sh'

data/app/assets/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.1.2
+
+- Update show-hide-content.js to work with new `.multiple-choice` custom radio buttons and checkboxes, released in GOV.UK elements 3.0.0 ([PR #390](https://github.com/alphagov/govuk_frontend_toolkit/pull/390))
+- Fix buttons not having an outer edge when colours are changed via browser settings - add an outline so they look like buttons. ([PR #377](https://github.com/alphagov/govuk_frontend_toolkit/pull/377))
+
 # 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))

data/app/assets/VERSION.txt

@@ -1 +1 @@
-5.1.1
+5.1.2

data/app/assets/docs/javascript.md

@@ -464,13 +464,15 @@ GOVUK.shimLinksWithButtonRole.init({
 
 Script to support show/hide content, toggled by radio buttons and checkboxes. This allows for progressive disclosure of question and answer forms based on selected values:
 
-    <label class="block-label" data-target="show-me">
-      <input type="radio" name="enabled" value="yes" /> Yes
-    </label>
+    <div class="multiple-choice" data-target="show-me">
+      <input type="radio" name="enabled" value="yes" />
+      <label>Yes</label>
+    </div>
 
-    <label class="block-label">
-      <input type="radio" name="enabled" value="no" /> No
-    </label>
+    <div class="multiple-choice">
+      <input type="radio" name="enabled" value="no" />
+      <label>No</label>
+    </div>
 
     <div id="show-me" class="panel js-hidden">
       <p>Show/Hide content to be toggled</p>

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

@@ -10,8 +10,8 @@
     // Radio and Checkbox selectors
     var selectors = {
       namespace: 'ShowHideContent',
-      radio: '.block-label[data-target] input[type="radio"]',
-      checkbox: '.block-label[data-target] input[type="checkbox"]'
+      radio: '[data-target] > input[type="radio"]',
+      checkbox: '[data-target] > input[type="checkbox"]'
     }
 
     // Escape name attribute for use in DOM selector
@@ -39,7 +39,7 @@
 
       // ARIA attributes aren't set before init
       if (!id) {
-        id = $control.closest('label').data('target')
+        id = $control.closest('[data-target]').data('target')
       }
 
       // Find show/hide content by id

data/app/assets/spec/unit/analytics/google-analytics-universal-tracker.spec.js

@@ -100,7 +100,7 @@ describe('GOVUK.GoogleAnalyticsUniversalTracker', function () {
       )
     })
 
-    it('tracks custom dimensions', function() {
+    it('tracks custom dimensions', function () {
       universal.trackEvent('category', 'action', {dimension29: 'Home'})
       expect(window.ga.calls.mostRecent().args).toEqual(
         ['send', {hitType: 'event', eventCategory: 'category', eventAction: 'action', dimension29: 'Home'}]

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

@@ -21,31 +21,31 @@ describe('show-hide-content', function () {
 
         // Radio buttons (yes/no)
         '<form>' +
-        '<label class="block-label" data-target="show-hide-radios">' +
+        '<div class="multiple-choice" data-target="show-hide-radios">' +
         '<input type="radio" name="single" value="yes">' +
-        'Yes' +
-        '</label>' +
-        '<label class="block-label">' +
+        '<label>Yes</label>' +
+        '</div>' +
+        '<div class="multiple-choice">' +
         '<input type="radio" name="single" value="no">' +
-        'No' +
-        '</label>' +
+        '<label>No</label>' +
+        '</div>' +
         '<div id="show-hide-radios" class="panel js-hidden" />' +
         '</form>' +
 
         // Checkboxes (multiple values)
         '<form>' +
-        '<label class="block-label" data-target="show-hide-checkboxes">' +
+        '<div class="multiple-choice" data-target="show-hide-checkboxes">' +
         '<input type="checkbox" name="multiple[option1]">' +
-        'Option 1' +
-        '</label>' +
-        '<label class="block-label">' +
+        '<label>Option 1</label>' +
+        '</div>' +
+        '<div class="multiple-choice">' +
         '<input type="checkbox" name="multiple[option2]">' +
-        'Option 2' +
-        '</label>' +
-        '<label class="block-label">' +
+        '<label>Option 2</label>' +
+        '</div>' +
+        '<div class="multiple-choice">' +
         '<input type="checkbox" name="multiple[option3]">' +
-        'Option 3' +
-        '</label>' +
+        '<label>Option 3</label>' +
+        '</div>' +
         '<div id="show-hide-checkboxes" class="panel js-hidden" />' +
         '</form>'
       )
@@ -225,7 +225,7 @@ describe('show-hide-content', function () {
         }))
         expect(events && events.click).toContain(jasmine.objectContaining({
           namespace: 'ShowHideContent',
-          selector: '.block-label[data-target] input[type="checkbox"]'
+          selector: '[data-target] > input[type="checkbox"]'
         }))
       })
     })
@@ -243,7 +243,7 @@ describe('show-hide-content', function () {
         }))
         expect(events && events.click).not.toContain(jasmine.objectContaining({
           namespace: 'ShowHideContent',
-          selector: '.block-label[data-target] input[type="checkbox"]'
+          selector: '[data-target] > input[type="checkbox"]'
         }))
       })
     })
@@ -254,14 +254,14 @@ describe('show-hide-content', function () {
       // Sample markup
       this.$content = $(
         // Radio buttons (yes/no)
-        '<label class="block-label" data-target="show-hide-radios">' +
+        '<div class="multiple-choice" data-target="show-hide-radios">' +
         '<input type="radio" name="single" value="yes">' +
-        'Yes' +
-        '</label>' +
-        '<label class="block-label">' +
+        '<label>Yes</label>' +
+        '</div>' +
+        '<div class="multiple-choice">' +
         '<input type="radio" name="single" value="no">' +
-        'No' +
-        '</label>' +
+        '<label>No</label>' +
+        '</div>' +
         '<div id="show-hide-radios" class="panel js-hidden" />'
       )
 

data/app/assets/stylesheets/design-patterns/_buttons.scss

@@ -30,6 +30,8 @@
   padding: .526315em .789473em .263157em; // 10px 15px 5px
   border: none;
   @include border-radius(0);
+  outline: 1px solid transparent; // keep some button appearance when changing colour settings in browsers
+  outline-offset: -1px; // fixes bug in Safari that outline width on focus is not overwritten, is reset to 0 on focus in govuk_template
   -webkit-appearance: none;
 
   // Bottom edge effect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails