govuk_publishing_components 27.1.0 → 27.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea0bb81f01cfea5a7fbefd1883bc66bbcb8a150d18dbce3a19848c9f86752c7
-  data.tar.gz: b2f8ef623497037c2f169c0455831aa7d2c0126f3ece9b05800486a1c283b2c5
+  metadata.gz: 701cdbaae0e829d529cf36553c1fa9a0856b552d1933700c1789276209bc131f
+  data.tar.gz: c2418c0148dfbf76fa3a689f50089d0f797216b68979a1056b3a08b84f56da98
 SHA512:
-  metadata.gz: 4aef038f59352ee50197fc9a1e35f95d5ff7c56a3f4182341a866301ea39643d94cf3db806d669135299db0b614cc1d8ddfb28aef8fd11a5d067703f717a4213
-  data.tar.gz: 1234faee1167e829e7e887599f9f47d5bf5c8eb1ee7dd228b3afbd058a17e5f67fed95103b1e511ef7ca76b8ebaec9b253a0b3f8706ddbcc4562a990d2b843c0
+  metadata.gz: 6658563042e32a3a4f9f6bf2d8f883b4f9bfae2c4fdbc7148e3878dbbd0d993e13263af5f7510167467777aac84e225673be2eb29e14dc3474d32046494093a4
+  data.tar.gz: 864f25f602249724ce5476e06918a9eb181edc0e9fb57ba394e578f0a95faa6790bab96733cc77d4bb69508b1b159dfc203412d7935ccb247b9938928c6fd4b9

data/app/assets/images/govuk_publishing_components/action-link-arrow--blue.svg

@@ -0,0 +1,3 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4893 23C17.8406 23 22.9893 17.8513 22.9893 11.5C22.9893 5.14873 17.8406 0 11.4893 0C5.64643 0 0.821276 4.35747 0.0862655 10H12.7633L8.98933 5.67277L10.4482 4L16.9893 11.5L10.4482 19L8.98933 17.3272L13.6354 12H0C0.261778 18.1193 5.30558 23 11.4893 23ZM13.9893 11.5942L14.0715 11.5L13.9893 11.4057V11.5942Z" fill="#366FB3"/>
+</svg>

data/app/assets/javascripts/govuk_publishing_components/analytics/auto-scroll-tracker.js

@@ -0,0 +1,197 @@
+window.GOVUK = window.GOVUK || {}
+window.GOVUK.Modules = window.GOVUK.Modules || {};
+
+(function (Modules) {
+  function AutoScrollTracker ($module) {
+    this.$module = $module
+    this.pageHeight = document.querySelector('body').clientHeight
+    this.trackedNodes = []
+    this.config = {
+      allowHeadingsInside: ['main'],
+      percentages: [20, 40, 60, 80, 100],
+      scrollTimeoutDelay: 20,
+      resizeTimeoutDelay: 100,
+      pageHeightTimeoutDelay: 500
+    }
+  }
+
+  AutoScrollTracker.prototype.init = function () {
+    var consentCookie = window.GOVUK.getConsentCookie()
+
+    if (consentCookie && consentCookie.settings) {
+      this.startModule()
+    } else {
+      this.startModule = this.startModule.bind(this)
+      window.addEventListener('cookie-consent', this.startModule)
+    }
+  }
+
+  AutoScrollTracker.prototype.startModule = function () {
+    if (window.GOVUK.analyticsVars.scrollTrackerStarted) {
+      return
+    }
+
+    window.GOVUK.analyticsVars.scrollTrackerStarted = true
+
+    this.trackType = this.$module.getAttribute('data-track-type')
+    if (this.trackType === 'headings') {
+      this.track = new AutoScrollTracker.Heading(this.config)
+    } else {
+      this.track = new AutoScrollTracker.Percentage(this.config)
+    }
+
+    this.getWindowDetails()
+    // if the URL has a hash we want to prevent tracking on initial page load
+    // until the browser jumps down the page, at which point a scroll event
+    // will happen and tracking will continue normally
+    var windowHash = window.location.hash
+    var dontTrackOnLoad = windowHash && document.getElementById(windowHash.substring(1))
+    if (!dontTrackOnLoad) {
+      this.trackVisibleNodes()
+    }
+
+    if (this.trackedNodes.length) {
+      // store event listener functions as variables so they can be removed if needed
+      this.scrollEvent = this.onScroll.bind(this)
+      window.addEventListener('scroll', this.scrollEvent)
+      this.resizeEvent = this.onResize.bind(this)
+      window.addEventListener('resize', this.resizeEvent)
+
+      // check if the page height changes e.g. accordion opened
+      this.interval = window.setInterval(function () {
+        var pageHeight = document.querySelector('body').clientHeight
+        if (pageHeight !== this.pageHeight) {
+          this.pageHeight = pageHeight
+          this.getWindowDetails()
+          this.trackVisibleNodes()
+        }
+      }.bind(this), this.config.pageHeightTimeoutDelay)
+    }
+  }
+
+  AutoScrollTracker.prototype.onScroll = function () {
+    clearTimeout(this.scrollTimeout)
+    this.scrollTimeout = setTimeout(function () {
+      this.trackVisibleNodes()
+    }.bind(this), this.config.scrollTimeoutDelay)
+  }
+
+  AutoScrollTracker.prototype.onResize = function () {
+    clearTimeout(this.resizeTimeout)
+    this.resizeTimeout = setTimeout(function () {
+      this.getWindowDetails()
+      this.trackVisibleNodes()
+    }.bind(this), this.config.resizeTimeoutDelay)
+  }
+
+  AutoScrollTracker.prototype.getWindowDetails = function () {
+    this.pageHeight = document.querySelector('body').clientHeight
+    this.windowHeight = window.innerHeight
+    this.trackedNodes = this.track.getTrackingNodes(this.trackedNodes)
+  }
+
+  AutoScrollTracker.prototype.trackVisibleNodes = function () {
+    for (var i = 0; i < this.trackedNodes.length; i++) {
+      var node = this.trackedNodes[i]
+      if (this.isVisible(node.top, node.bottom) && !node.alreadySeen) {
+        node.alreadySeen = true
+        // we store whether a heading has been tracked or not on the heading
+        // because if headings appear/disapper (e.g. inside an accordion)
+        // the order changes, so we can't refer to the previous trackedNodes
+        // as we do with percentages
+        if (node.node) {
+          node.node.setAttribute('data-autoscrolltracker-already-seen', true)
+        }
+
+        var action = node.eventData.action
+        var label = node.eventData.label
+
+        if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
+          window.GOVUK.analytics.trackEvent('ScrollTo', action, { label: label, nonInteraction: true })
+        }
+      }
+    }
+  }
+
+  AutoScrollTracker.prototype.isVisible = function (top, bottom) {
+    var scroll = window.scrollY || document.documentElement.scrollTop // IE fallback
+    return scroll <= top && (scroll + this.windowHeight) >= bottom
+  }
+
+  AutoScrollTracker.Heading = function (config) {
+    this.config = config
+  }
+
+  AutoScrollTracker.Heading.prototype.getTrackingNodes = function () {
+    var headingsDetails = []
+    var headingsFound = this.findAllowedHeadings()
+
+    for (var i = 0; i < headingsFound.length; i++) {
+      var heading = headingsFound[i]
+      // only track headings that are visible i.e. not inside display: none
+      if (this.visible(heading)) {
+        var pos = heading.getBoundingClientRect()
+        headingsDetails.push({
+          node: heading,
+          alreadySeen: heading.getAttribute('data-autoscrolltracker-already-seen'),
+          top: pos.top + document.documentElement.scrollTop,
+          bottom: pos.bottom + document.documentElement.scrollTop,
+          eventData: { action: 'Heading', label: heading.textContent.replace(/\s+/g, ' ').trim() }
+        })
+      }
+    }
+    return headingsDetails
+  }
+
+  // check heading is inside allowed elements, generally ignores everything outside of page content
+  AutoScrollTracker.Heading.prototype.findAllowedHeadings = function () {
+    var headings = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6']
+    var headingsFound = []
+
+    for (var h = 0; h < this.config.allowHeadingsInside.length; h++) {
+      var insideElements = document.querySelectorAll(this.config.allowHeadingsInside[h])
+      for (var e = 0; e < insideElements.length; e++) {
+        var found = insideElements[e].querySelectorAll(headings)
+        for (var f = 0; f < found.length; f++) {
+          headingsFound.push(found[f])
+        }
+      }
+    }
+    return headingsFound
+  }
+
+  // this is bit more verbose than checking offsetParent !== null but more reliable for IE10+
+  AutoScrollTracker.Heading.prototype.visible = function (el) {
+    return !!(el.offsetWidth || el.offsetHeight || el.getClientRects().length)
+  }
+
+  AutoScrollTracker.Percentage = function (config) {
+    this.config = config
+  }
+
+  AutoScrollTracker.Percentage.prototype.getTrackingNodes = function (trackedNodes) {
+    var body = document.body
+    var html = document.documentElement
+    var pageHeight = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight)
+
+    var percentDetails = []
+
+    for (var i = 0; i < this.config.percentages.length; i++) {
+      var percent = this.config.percentages[i]
+      var pos = (pageHeight / 100) * percent
+      var alreadySeen = false
+      if (trackedNodes.length) {
+        alreadySeen = trackedNodes[i].alreadySeen
+      }
+      percentDetails.push({
+        alreadySeen: alreadySeen,
+        top: pos,
+        bottom: pos,
+        eventData: { action: 'Percent', label: String(percent) }
+      })
+    }
+    return percentDetails
+  }
+
+  Modules.AutoScrollTracker = AutoScrollTracker
+})(window.GOVUK.Modules)

data/app/assets/javascripts/govuk_publishing_components/analytics.js

@@ -14,6 +14,7 @@
 //= require ./analytics/ecommerce
 //= require ./analytics/init
 //= require ./analytics/scroll-tracker
+//= require ./analytics/auto-scroll-tracker
 //= require ./analytics/explicit-cross-domain-links
 //= require ./analytics/track-click
 //= require ./analytics/track-select-change

data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss

@@ -92,6 +92,18 @@
   }
 }
 
+.gem-c-action-link--blue-arrow {
+  &:before {
+    width: 35px;
+    height: 30px;
+    background: image-url("govuk_publishing_components/action-link-arrow--blue.png");
+    background: image-url("govuk_publishing_components/action-link-arrow--blue.svg"), linear-gradient(transparent, transparent);
+    background-repeat: no-repeat;
+    background-size: 25px auto;
+    background-position: 0 2px;
+  }
+}
+
 .gem-c-action-link--simple {
   &:before {
     width: 30px;

data/app/views/govuk_publishing_components/components/_action_link.html.erb

@@ -9,6 +9,7 @@
   subtext_href ||= false
   mobile_subtext ||= false
   light_text ||= false
+  blue_arrow ||= false
   simple ||= false
   simple_light ||= false
   dark_icon ||= false
@@ -27,6 +28,7 @@
   css_classes << "gem-c-action-link--transparent-icon" if transparent_icon
   css_classes << "gem-c-action-link--nhs" if nhs_icon
   css_classes << "gem-c-action-link--brexit" if brexit_icon
+  css_classes << "gem-c-action-link--blue-arrow" if blue_arrow
   css_classes << "gem-c-action-link--simple" if simple
   css_classes << "gem-c-action-link--simple-light" if simple_light
   css_classes << "gem-c-action-link--with-subtext" if subtext

data/app/views/govuk_publishing_components/components/_big_number.html.erb

@@ -12,7 +12,7 @@
 %>
 <% if number %>
   <% big_number_value = capture do %>
-    <%= tag.span class: classes do %>
+    <%= tag.span class: classes, data: href ? nil : data_attributes do %>
       <%= number %>
     <% end %>
 

data/app/views/govuk_publishing_components/components/_layout_for_public.html.erb

@@ -87,7 +87,9 @@
 
     <% unless omit_header %>
       <% if show_explore_header %>
-        <%= render "govuk_publishing_components/components/layout_super_navigation_header" %>
+        <%= render "govuk_publishing_components/components/layout_super_navigation_header", {
+          logo_link: logo_link,
+        } %>
       <% else %>
         <%= render "govuk_publishing_components/components/layout_header", {
           search: show_search,

data/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb

@@ -1,20 +1,19 @@
 <%
-logo_link = "https://www.gov.uk/"
-logo_link_title = t("components.layout_super_navigation_header.logo_link_title")
-logo_text = t("components.layout_super_navigation_header.logo_text")
-navigation_links = t("components.layout_super_navigation_header.navigation_links")
-navigation_menu_heading = t("components.layout_super_navigation_header.navigation_menu_heading")
-navigation_search_heading = t("components.layout_super_navigation_header.navigation_search_heading")
-navigation_search_subheading = t("components.layout_super_navigation_header.navigation_search_subheading")
-popular_links = t("components.layout_super_navigation_header.popular_links")
-popular_links_heading = t("components.layout_super_navigation_header.popular_links_heading")
-search_text = t("components.layout_super_navigation_header.search_text")
-
-hide_search_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "search")
-show_search_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.show", :label => "search")
-hide_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "navigation")
-show_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.show", :label => "navigation")
+  logo_link ||= "https://www.gov.uk/"
+  logo_link_title ||= t("components.layout_super_navigation_header.logo_link_title")
+  logo_text = t("components.layout_super_navigation_header.logo_text")
+  navigation_links = t("components.layout_super_navigation_header.navigation_links")
+  navigation_menu_heading = t("components.layout_super_navigation_header.navigation_menu_heading")
+  navigation_search_heading = t("components.layout_super_navigation_header.navigation_search_heading")
+  navigation_search_subheading = t("components.layout_super_navigation_header.navigation_search_subheading")
+  popular_links = t("components.layout_super_navigation_header.popular_links")
+  popular_links_heading = t("components.layout_super_navigation_header.popular_links_heading")
+  search_text = t("components.layout_super_navigation_header.search_text")
 
+  hide_search_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "search")
+  show_search_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.show", :label => "search")
+  hide_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.hide", :label => "navigation")
+  show_navigation_menu_text = t("components.layout_super_navigation_header.menu_toggle_label.show", :label => "navigation")
 %>
 <header role="banner" class="gem-c-layout-super-navigation-header">
   <div class="gem-c-layout-super-navigation-header__container govuk-width-container govuk-clearfix">

data/app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb

@@ -19,17 +19,17 @@
     tracking_options ||= ({ dimension96: tracking_id }).to_json
   end
 
-  local_assigns[:margin_bottom] ||= 0
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
-  classes = "gem-c-step-nav-header #{shared_helper.get_margin_bottom}"
+  classes = %w(gem-c-step-nav-header)
+  classes << shared_helper.get_margin_bottom if local_assigns[:margin_bottom]
 %>
 <% if title %>
   <script type="application/ld+json">
     <%= raw JSON.pretty_generate(breadcrumb_presenter.structured_data) %>
   </script>
 
-  <h2 class="<%= classes %>" data-module="gem-track-click">
-    <span class="gem-c-step-nav-header__part-of">Part of</span>
+  <%= tag.div class: classes, data: { module: "gem-track-click" } do %>
+    <strong class="gem-c-step-nav-header__part-of">Part of</strong>
     <% if path %>
       <a href="<%= path %>"
         class="gem-c-step-nav-header__title govuk-link"
@@ -51,5 +51,5 @@
         <%= title %>
       </span>
     <% end %>
-  </h2>
+  <% end %>
 <% end %>

data/app/views/govuk_publishing_components/components/docs/action_link.yml

@@ -78,6 +78,11 @@ examples:
       light_text: true
     context:
       dark_background: true
+  blue_arrow:
+    data:
+      text: Find out how to stay safe and help prevent the spread
+      href: "/something"
+      blue_arrow: true
   simple_arrow:
     data:
       text: Getting financial help and keeping your business safe

data/app/views/govuk_publishing_components/components/docs/big_number.yml

@@ -35,7 +35,7 @@ examples:
       href: "/government/organisations#ministerial_departments"
   with_data_attributes:
     description: |
-      These data attributes will only be present if a `href` attribute is present.
+      If a `href` attribute is present, data attributes will apply to the `span` containing the number value (see below).
       
       This will also not automatically apply a `gem-track-click` module attribute if the data attributes pertain to click tracking. Remember to apply this outside the component call in a surrounding element, if using.
     data:
@@ -48,3 +48,9 @@ examples:
         track-label: "/government/organisations#ministerial_departments"
         track-dimension: 23 Ministerial departments
         track-dimension-index: 29
+  with_data_attributes_but_no_link:
+    data:
+      number: 23
+      label: Ministerial departments
+      data_attributes:
+        department-count: true

data/app/views/govuk_publishing_components/components/docs/inverse_header.yml

@@ -1,15 +1,14 @@
 name: Inverse header
 description: A wrapper to contain header content in white text
 body: |
-  This component can be passed a block of template code and will wrap it in a blue header. This is as light-touch as possible and doesn't attempt to deal with the margins and paddings of its content. White text is enforced on content and would need to be overriden where unwanted. Implemented to accomodate topic and list page headings and breadcrumbs but unopinionated about its contents.
+  This component can be passed a block of template code and will wrap it in a blue header. This is as light-touch as possible and doesn't attempt to deal with the margins and paddings of its content. White text is enforced on content and would need to be overridden where unwanted. Implemented to accommodate topic and list page headings and breadcrumbs but unopinionated about its contents.
 
   If passing links to the block make sure to add [the inverse modifier](https://design-system.service.gov.uk/styles/typography/#links-on-dark-backgrounds).
 
 accessibility_criteria: |
   The component must:
 
-  * be used in conjunction with content that renders a text contrast ratio higher than 4.5:1
-  against the header colour to meet WCAG AA.
+  * be used in conjunction with content that renders a text contrast ratio higher than 4.5:1 against the header colour to meet WCAG AA.
 
 accessibility_excluded_rules:
   - skip-link # Examples of this component contain breadcrumbs, creating a reference to #content which is part of the layout
@@ -33,7 +32,7 @@ examples:
           </h1>
         </div>
   html_publication_header:
-    description: "The inverse header component is used on HTMl publications. [See example on GOV.UK here](https://www.gov.uk/government/publications/ln5-0at-jackson-homes-scopwick-ltd-environmental-permit-application-advertisement/ln5-0at-jackson-homes-scopwick-ltd-environmental-permit-application)"
+    description: "The inverse header component is used on HTML publications. [See example on GOV.UK here](https://www.gov.uk/government/publications/ln5-0at-jackson-homes-scopwick-ltd-environmental-permit-application-advertisement/ln5-0at-jackson-homes-scopwick-ltd-environmental-permit-application)"
     data:
       block: |
         <div class="gem-c-title gem-c-title--inverse gem-c-title--bottom-margin">

data/app/views/govuk_publishing_components/components/docs/layout_super_navigation_header.yml

@@ -20,3 +20,8 @@ accessibility_excluded_rules:
   - landmark-no-duplicate-banner # banners will be duplicated in component examples list
 examples:
   default:
+  with_custom_logo_link:
+    description: The header logo links to root by default. This option allows us to override that in certain instances. Remember to change the title, as the default is "Go to the GOV.UK homepage".
+    data:
+      logo_link: "https://www.example.com"
+      logo_link_title: "Go to example"

data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb

@@ -1,11 +1,14 @@
 <div class="govuk-header__logo gem-c-header__logo">
   <a href="<%= logo_link %>" class="govuk-header__link govuk-header__link--homepage" data-module="gem-track-click" data-track-category="homeLinkClicked" data-track-action="homeHeader">
     <span class="govuk-header__logotype gem-c-header__logotype">
+      <!--[if gt IE 8]><!-->
       <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="30" width="36">
         <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-        <%# Deliberate use of image tag as a fallback method https://lynn.ru/examples/svg/en.html %>
-        <image src="<%= asset_path('govuk-logotype-crown.png') %>" xlink:href="" display="none" class="govuk-header__logotype-crown-fallback-image" width="36" height="30"></image>
       </svg>
+      <!--<![endif]-->
+      <!--[if IE 8]>
+      <img src="<%= asset_path('govuk-logotype-crown.png') %>" alt="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32">
+      <![endif]-->
       <span class="govuk-header__logotype-text">
         GOV.UK
       </span>

data/config/locales/ar.yml

@@ -43,6 +43,15 @@ ar:
       hide:
       text:
       title:
+    devolved_nations:
+      applies_to:
+      connectors:
+        last_word:
+        two_words:
+      england:
+      northern_ireland:
+      scotland:
+      wales:
     feedback:
       close:
       dont_include_personal_info:
@@ -69,10 +78,36 @@ ar:
       news_and_communications:
       statistics:
       worldwide:
+    intervention:
+      description:
+      dismiss_link_text:
+      dismiss_post_link:
+      title:
     layout_footer:
       copyright_html:
       licence_html:
       support_links:
+    layout_for_public:
+      account_layout:
+        feedback:
+          banners:
+            footer_intro:
+            footer_link:
+            footer_outro:
+            phase_intro:
+            phase_link:
+            phase_outro:
+            title:
+        navigation:
+          destroy_user_session:
+          menu_bar:
+            account:
+              link_text:
+            manage:
+              link_text:
+            security:
+              link_text:
+          user_root_path:
     layout_header:
       hide_button:
       menu:
@@ -82,6 +117,9 @@ ar:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      menu_toggle_label:
+        hide:
+        show:
       navigation_links:
       navigation_menu_heading:
       navigation_search_heading:
@@ -100,6 +138,8 @@ ar:
       toggle_more:
     modal_dialogue:
       close_modal:
+    notice:
+      banner_title:
     organisation_schema:
       all_content_search_description:
     previous_and_next_navigation:

data/config/locales/az.yml

@@ -43,6 +43,15 @@ az:
       hide:
       text:
       title:
+    devolved_nations:
+      applies_to:
+      connectors:
+        last_word:
+        two_words:
+      england:
+      northern_ireland:
+      scotland:
+      wales:
     feedback:
       close:
       dont_include_personal_info:
@@ -69,10 +78,36 @@ az:
       news_and_communications:
       statistics:
       worldwide:
+    intervention:
+      description:
+      dismiss_link_text:
+      dismiss_post_link:
+      title:
     layout_footer:
       copyright_html:
       licence_html:
       support_links:
+    layout_for_public:
+      account_layout:
+        feedback:
+          banners:
+            footer_intro:
+            footer_link:
+            footer_outro:
+            phase_intro:
+            phase_link:
+            phase_outro:
+            title:
+        navigation:
+          destroy_user_session:
+          menu_bar:
+            account:
+              link_text:
+            manage:
+              link_text:
+            security:
+              link_text:
+          user_root_path:
     layout_header:
       hide_button:
       menu:
@@ -82,6 +117,9 @@ az:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      menu_toggle_label:
+        hide:
+        show:
       navigation_links:
       navigation_menu_heading:
       navigation_search_heading:
@@ -100,6 +138,8 @@ az:
       toggle_more:
     modal_dialogue:
       close_modal:
+    notice:
+      banner_title:
     organisation_schema:
       all_content_search_description:
     previous_and_next_navigation:

data/config/locales/be.yml

@@ -43,6 +43,15 @@ be:
       hide:
       text:
       title:
+    devolved_nations:
+      applies_to:
+      connectors:
+        last_word:
+        two_words:
+      england:
+      northern_ireland:
+      scotland:
+      wales:
     feedback:
       close:
       dont_include_personal_info:
@@ -69,10 +78,36 @@ be:
       news_and_communications:
       statistics:
       worldwide:
+    intervention:
+      description:
+      dismiss_link_text:
+      dismiss_post_link:
+      title:
     layout_footer:
       copyright_html:
       licence_html:
       support_links:
+    layout_for_public:
+      account_layout:
+        feedback:
+          banners:
+            footer_intro:
+            footer_link:
+            footer_outro:
+            phase_intro:
+            phase_link:
+            phase_outro:
+            title:
+        navigation:
+          destroy_user_session:
+          menu_bar:
+            account:
+              link_text:
+            manage:
+              link_text:
+            security:
+              link_text:
+          user_root_path:
     layout_header:
       hide_button:
       menu:
@@ -82,6 +117,9 @@ be:
     layout_super_navigation_header:
       logo_link_title:
       logo_text:
+      menu_toggle_label:
+        hide:
+        show:
       navigation_links:
       navigation_menu_heading:
       navigation_search_heading:
@@ -100,6 +138,8 @@ be:
       toggle_more:
     modal_dialogue:
       close_modal:
+    notice:
+      banner_title:
     organisation_schema:
       all_content_search_description:
     previous_and_next_navigation: