govuk_frontend_toolkit 4.18.4 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed31373cbe3fd29495e7825368045f0961c44b00
-  data.tar.gz: 5e1914525810948b8ea7ebeb6a863500c3b8dc7e
+  metadata.gz: ff8f1703a8d15e9962e1a8c93c443accd075c4c6
+  data.tar.gz: a494d718895df6b12456aad04b7dd88ad91990d6
 SHA512:
-  metadata.gz: 6de494a693da9ee1f4650cec2e256de23b91b46627f035e7d688e4ab4625e9dfce928809b6f1ae921e32879bf8de4a32f5492111fe37f88e1742047510128e5c
-  data.tar.gz: 1581b99971f60eebab602605fe1bc1de2e32b69ccec3b4d00653759b9e8f000e76c63d5c3543f08829958e2bebf9bb045f51bf6410a8b19e7b669b4c260f5f34
+  metadata.gz: d780600b4e3d022d7c7ca4ba0a9bf093f5a87d1c89e98362f51db2441132a0c5e12d4b89d686d3ca4c4efe6dcdb8db36add955f8d21c123e5231b12a190f6593
+  data.tar.gz: 3899d64d9b3d12e427ba54b728767af1ed1e6a709bd68c140b4a2ef9045b140ed23ec03a5d0a1ce7614c99230251c83d88cb080acbb58bfc65377fc521b07250

data/app/assets/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 5.0.0
+
+This release includes two breaking changes:
+- Removal of external link styles and icons, if you are using the external-link-* mixins you will need to remove them from your codebase ([PR #293](https://github.com/alphagov/govuk_frontend_toolkit/pull/293))
+- Correct spelling of the 'accordion' icon, you will need to check for the incorrect spelling 'accordian' and update if you are using this icon ([PR #345](https://github.com/alphagov/govuk_frontend_toolkit/pull/345))
+And two minor changes:
+- Amend GOVUK.StickAtTopWhenScrolling to resize the sticky element and shim when the .js-sticky-resize class is set ([PR #343](https://github.com/alphagov/govuk_frontend_toolkit/pull/343))
+- Allow custom options in GOVUK.analytics.trackPageview ([#332](https://github.com/alphagov/govuk_frontend_toolkit/pull/332))
+
 # 4.18.4
 
 - Lint codebase using standard ([PR #334](https://github.com/alphagov/govuk_frontend_toolkit/pull/334))

data/app/assets/VERSION.txt

@@ -1 +1 @@
-4.18.4
+5.0.0

data/app/assets/docs/analytics.md

@@ -74,6 +74,11 @@ GOVUK.analytics.trackPageview('/path');
 
 // Track a custom path and custom page title
 GOVUK.analytics.trackPageview('/path', 'Title');
+
+// As above, plus additional options passed into the `pageview` call
+GOVUK.analytics.trackPageview('/path', 'Title', {
+  sessionControl: 'start'
+});
 ```
 
 ## Custom events

data/app/assets/docs/mixins.md

@@ -378,61 +378,6 @@ Tabular numbers have numerals of a standard fixed width. As all numbers have the
 
 [See an example of tabular numbers in a table](http://govuk-elements.herokuapp.com/data/#data-table-numeric)
 
-#### external links
-
-`external-link-default` sets up the background image for all external links.
-This should be included on the default link style for a project.
-
-After setting the default, apply includes from the following for different font sizes:
-
-* `external-link-12`
-* `external-link-12-no-hover`
-* `external-link-13`
-* `external-link-13-no-hover`
-* `external-link-14`
-* `external-link-14-bold-no-hover`
-* `external-link-16`
-* `external-link-16-bold-no-hover`
-* `external-link-19`
-* `external-link-19-no-hover`
-
-`external-link-heading` is a unique style a background image for headings to groups of external links.
-
-This uses the `file-url` helper which will by default output an `image-url` to
-be used with Compass or Rails Asset Pipeline, if you want to use a static path
-then set the `$path` variable to point to the public location of the toolkit
-image assets.
-
-#### Description
-
-For a set style:
-
-`@include external-link-[style]`
-
-For a specific font size:
-
-`@include external-link-[size]-[weight]-[no-hover]`
-
-#### Usage
-
-    /* Default link style */
-    a[rel="external"] {
-      @include external-link-default;
-      @include external-link-19;
-    }
-
-    th.external-link {
-      @include external-link-heading;
-    }
-
-    .inner a[rel="external"] {
-      @include external-link-16;
-    }
-
-    .departments a[rel="external"] {
-     @include external-link-16-bold-no-hover;
-    }
-
 ### <a id="css3"></a>css3
 
 CSS3 helpers to abstract vendor prefixes.

data/app/assets/javascripts/govuk/analytics/google-analytics-universal-tracker.js

@@ -1,6 +1,7 @@
 ;(function (global) {
   'use strict'
 
+  var $ = global.jQuery
   var GOVUK = global.GOVUK || {}
 
   var GoogleAnalyticsUniversalTracker = function (trackingId, fieldsObject) {
@@ -34,24 +35,24 @@
 
   // https://developers.google.com/analytics/devguides/collection/analyticsjs/pages
   GoogleAnalyticsUniversalTracker.prototype.trackPageview = function (path, title, options) {
-    options = options || {}
+    var pageviewObject
 
     if (typeof path === 'string') {
-      var pageviewObject = {
-        page: path
-      }
+      pageviewObject = { page: path }
+    }
 
-      if (typeof title === 'string') {
-        pageviewObject.title = title
-      }
+    if (typeof title === 'string') {
+      pageviewObject = pageviewObject || {}
+      pageviewObject.title = title
+    }
 
-      // Set the transport method for the pageview
-      // Typically used for enabling `navigator.sendBeacon` when the page might be unloading
-      // https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#transport
-      if (options.transport) {
-        pageviewObject.transport = options.transport
-      }
+    // Set an options object for the pageview (e.g. transport, sessionControl)
+    // https://developers.google.com/analytics/devguides/collection/analyticsjs/field-reference#transport
+    if (typeof options === 'object') {
+      pageviewObject = $.extend(pageviewObject || {}, options)
+    }
 
+    if (!$.isEmptyObject(pageviewObject)) {
       sendToGa('send', 'pageview', pageviewObject)
     } else {
       sendToGa('send', 'pageview')

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

@@ -91,6 +91,15 @@
         sticky.$els.each(function (i, el) {
           var $el = $(el)
 
+          var elResize = $el.hasClass('js-sticky-resize')
+          if (elResize) {
+            var $shim = $('.shim')
+            var $elParent = $el.parent('div')
+            var elParentWidth = $elParent.width()
+            $shim.css('width', elParentWidth)
+            $el.css('width', elParentWidth)
+          }
+
           if (windowDimensions.width <= 768) {
             sticky.release($el)
           }

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

@@ -67,6 +67,11 @@ describe('GOVUK.GoogleAnalyticsUniversalTracker', function () {
       expect(window.ga.calls.mostRecent().args).toEqual(['send', 'pageview'])
     })
 
+    it('sends them to Google Analytics, forcing a new session', function () {
+      universal.trackPageview(undefined, undefined, { sessionControl: 'start' })
+      expect(window.ga.calls.mostRecent().args).toEqual(['send', 'pageview', {sessionControl: 'start'}])
+    })
+
     it('can track a virtual pageview', function () {
       universal.trackPageview('/nicholas-page')
       expect(window.ga.calls.mostRecent().args).toEqual(['send', 'pageview', {page: '/nicholas-page'}])

data/app/assets/spec/unit/stick-at-top-when-scrolling.spec.js

@@ -80,6 +80,25 @@ describe('stick-at-top-when-scrolling', function () {
       expect($stickyElement.hasClass('content-fixed')).toBe(true)
     })
 
+    it('should check the width of the parent, and make the width of the element and the shim the same on resize', function () {
+      var $stickyResizeElement = $('<div class="stick-at-top-when-scrolling js-sticky-resize"></div>')
+      var $stickyResizeWrapper = $('<div class="column-third" style="width:300px;">').append($stickyResizeElement)
+      $('body').append($stickyResizeWrapper)
+
+      GOVUK.stickAtTopWhenScrolling.$els = $stickyResizeElement
+      GOVUK.stickAtTopWhenScrolling._hasResized = true
+      GOVUK.stickAtTopWhenScrolling.checkResize()
+
+      var stickyElementParentWidth = $stickyResizeElement.parent('div').width()
+      expect(stickyElementParentWidth).toBe(300)
+
+      var stickyElementWidth = $stickyResizeElement.width()
+      expect(stickyElementWidth).toBe(300)
+
+      var stickElementShimWidth = $('.shim').width()
+      expect(stickElementShimWidth).toBe(300)
+    })
+
     it('should unstick, if the scroll position is less than the point at which scrolling started', function () {
       GOVUK.stickAtTopWhenScrolling.getWindowPositions = function () {
         return {

data/app/assets/stylesheets/_typography.scss

@@ -247,90 +247,3 @@ $is-print: false !default;
     padding-bottom: 5px;
   }
 }
-
-// External link styles for all font sizes
-
-// Private mixin for use solely by those below
-
-@mixin external-link-size($content, $top, $top-hover: top) {
-  &:after {
-    content: $content;
-    background-position: right $top;
-  }
-
-  @if $top-hover == top {
-    $top-hover: $top;
-  }
-
-  &:hover:after {
-    background-position: right $top-hover;
-  }
-}
-
-@mixin external-link-12-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0\A0\A0\A0", $top: 0);
-}
-
-@mixin external-link-12 {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0\A0\A0\A0", $top: 0, $top-hover: -388px);
-}
-
-@mixin external-link-13-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0", $top: 1px);
-}
-
-@mixin external-link-13 {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0", $top: 1px, $top-hover: -387px);
-}
-
-@mixin external-link-14 {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0", $top: 1px, $top-hover: -387px);
-}
-
-@mixin external-link-14-bold-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0\A0", $top: 2px);
-}
-
-@mixin external-link-16 {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0", $top: 3px, $top-hover: -385px);
-}
-
-@mixin external-link-16-bold-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0\A0", $top: 3px);
-}
-
-@mixin external-link-19-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0", $top: 6px);
-}
-
-@mixin external-link-19 {
-  @include external-link-size($content: "\A0\A0\A0\A0", $top: 6px, $top-hover: -382px);
-}
-
-@mixin external-link-19-bold-no-hover {
-  @include external-link-size($content: "\A0\A0\A0\A0\A0\A0", $top: 6px);
-}
-
-@mixin external-link-default {
-  &:after {
-    background-image: file-url("external-links/external-link.png");
-    background-repeat: no-repeat;
-
-    @include device-pixel-ratio() {
-      background-image: file-url("external-links/external-link-24x24.png");
-      background-size: 12px 400px;
-    }
-  }
-}
-
-@mixin external-link-heading {
-  &:after {
-    background-image: file-url("external-links/external-link-black-12x12.png");
-    background-repeat: no-repeat;
-
-    @include device-pixel-ratio() {
-      background-image: file-url("external-links/external-link-black-24x24.png");
-      background-size: 12px 400px;
-    }
-  }
-}

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

@@ -126,14 +126,6 @@
     }
   }
 
-  // Reset styles applied to external links
-  &[rel="external"]:after {
-    display: none;
-    content: none;
-    margin-left: 0;
-    margin-right: 0;
-  }
-
   // Fixes a bug where IE puts a black border around certain elements
   @include ie-lte(8) {
     &[type="submit"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_frontend_toolkit
 version: !ruby/object:Gem::Version
-  version: 4.18.4
+  version: 5.0.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,8 +96,8 @@ files:
 - app/assets/docs/functions.md
 - app/assets/docs/javascript.md
 - app/assets/docs/mixins.md
-- app/assets/images/accordian-arrow-2x.png
-- app/assets/images/accordian-arrow.png
+- app/assets/images/accordion-arrow-2x.png
+- app/assets/images/accordion-arrow.png
 - app/assets/images/arrow-sprite.png
 - app/assets/images/crests/bis_crest_13px.png
 - app/assets/images/crests/bis_crest_13px_x2.png
@@ -171,10 +171,6 @@ files:
 - app/assets/images/crests/wales_crest_18px_x2.png
 - app/assets/images/crests/wales_crest_27px.png
 - app/assets/images/crests/wales_crest_27px_x2.png
-- app/assets/images/external-links/external-link-24x24.png
-- app/assets/images/external-links/external-link-black-12x12.png
-- app/assets/images/external-links/external-link-black-24x24.png
-- app/assets/images/external-links/external-link.png
 - app/assets/images/icon-arrow-left.png
 - app/assets/images/icon-calendar-2x.png
 - app/assets/images/icon-calendar.png