govuk_publishing_components 27.7.0 → 27.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c7bcc4d82cf3b301b7b7ba021e1bb3de52fcd8834526953c559ec6dee2c50e
-  data.tar.gz: 46ed67c901b6561008e808d60b42d67c5c0ff6555d47ea25eb94dfb5e89e0543
+  metadata.gz: 716757ceb3c2638a8c67e577bd15a1b62f9b65127ba98252084695f65ae961e9
+  data.tar.gz: 50c813732192c2f8a95a65f29cee6ad2ee9fceaa43f766f46d27c5b132db2fbc
 SHA512:
-  metadata.gz: f8b1714ed5784b5e37882f50855cb5ebe51c9fa334ed3214a7b3a8703efc5dfa97cabc62c5a69f5cda8ff8047ad09eb6e8869cc525d8fb782099c2b376d20ab4
-  data.tar.gz: ff89e8308d97f9a46ca3246e6978ea3fe24fca5852b3dac2f11f5b5822b1ac3bb7d116afe40cde48341e420347075ff52517cfd97cdb845c044a03ace9b18194
+  metadata.gz: 1c7293c79a3baf87072f3994cb5b8eaee52838bf94b539681bc8cf3719e4e2df1a0fe22c3683c1da9df0d0abb88cad4c57a7aa75e267274db3f2bad90b3606a3
+  data.tar.gz: 4bcca70d40ad1f482bcc1b1bc7497ec43e1561262125f9009f6d5b119104c1684fe47f527a67ee56f49452e0861c60a6a8db083f8ad66333dde9f5b57c2d4847

data/README.md

@@ -47,6 +47,7 @@ bin/rake app:jasmine:ci
 - [Code documentation on rubydoc.info](http://www.rubydoc.info/gems/govuk_publishing_components)
 - [Component conventions](docs/component_conventions.md)
 - [Component principles](docs/component_principles.md)
+- [Component auditing](docs/auditing.md)
 
 ## Licence
 

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

@@ -36,11 +36,20 @@
       fieldsObject = { cookieDomain: fieldsObject }
     }
 
+    function setLinkedDomains () {
+      var domains = window.GOVUK.analyticsVars.primaryLinkedDomains
+      if (domains && domains.length > 0) {
+        sendToGa('require', 'linker')
+        sendToGa('linker:autoLink', domains)
+      }
+    }
+
     configureProfile()
     anonymizeIp()
     disableAdFeatures()
     stripTitlePII()
     stripLocationPII()
+    setLinkedDomains()
   }
 
   GoogleAnalyticsUniversalTracker.load = function () {

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

@@ -3,9 +3,12 @@ var analyticsInit = function () {
 
   var analyticsVars = window.GOVUK.analyticsVars || false
   if (analyticsVars) {
-    var gaProperty = window.GOVUK.analyticsVars.gaProperty || false
-    var gaPropertyCrossDomain = window.GOVUK.analyticsVars.gaPropertyCrossDomain || false
-    var linkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
+    // the property naming convention here isn't consistent, but used in static and
+    // govuk-account-manager-prototype, so hard to change
+    var primaryGaProperty = window.GOVUK.analyticsVars.gaProperty || false
+
+    var crossDomainGaProperty = window.GOVUK.analyticsVars.gaPropertyCrossDomain || false
+    var crossDomainLinkedDomains = window.GOVUK.analyticsVars.linkedDomains || false
   }
 
   window.GOVUK.Analytics.checkDigitalIdentityConsent = function (location) {
@@ -39,7 +42,7 @@ var analyticsInit = function () {
 
   // Disable analytics by default
   // This will be reversed below, if the consent cookie says usage cookies are allowed
-  var disabler = 'ga-disable-' + gaProperty
+  var disabler = 'ga-disable-' + primaryGaProperty
   window[disabler] = true
 
   if (consentCookie && consentCookie.usage) {
@@ -48,14 +51,14 @@ var analyticsInit = function () {
     // Load Google Analytics libraries
     window.GOVUK.StaticAnalytics.load()
 
-    if (gaProperty) {
+    if (primaryGaProperty) {
       // Use document.domain in dev, preview and staging so that tracking works
       // Otherwise explicitly set the domain as www.gov.uk (and not gov.uk).
       var cookieDomain = (document.domain === 'www.gov.uk') ? '.www.gov.uk' : document.domain
 
       // Configure profiles, setup custom vars, track initial pageview
       var analytics = new window.GOVUK.StaticAnalytics({
-        universalId: gaProperty,
+        universalId: primaryGaProperty,
         cookieDomain: cookieDomain,
         allowLinker: true
       })
@@ -63,8 +66,9 @@ var analyticsInit = function () {
       // Make interface public for virtual pageviews and events
       window.GOVUK.analytics = analytics
 
-      if (linkedDomains && linkedDomains.length > 0) {
-        window.GOVUK.analytics.addLinkedTrackerDomain(gaPropertyCrossDomain, 'govuk', linkedDomains)
+      // set up linking of domains for cross domain ga property
+      if (crossDomainLinkedDomains && crossDomainLinkedDomains.length > 0) {
+        window.GOVUK.analytics.addLinkedTrackerDomain(crossDomainGaProperty, 'govuk', crossDomainLinkedDomains)
       }
     }
   } else {

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

@@ -58,13 +58,6 @@
     '/guidance/foreign-travel-insurance': [
       ['Heading', 'What your travel insurance policy should cover']
     ],
-    '/guidance/social-security-contributions-for-uk-and-eu-workers-if-the-uk-leaves-the-eu-with-no-deal': [
-      ['Heading', 'UK employers'],
-      ['Heading', 'UK employees and self-employed']
-    ],
-    '/guidance/student-finance-arrangements-in-a-no-deal-scenario': [
-      ['Heading', 'Other overseas study placements']
-    ],
     '/guidance/living-in-france': [
       ['Heading', 'Passports and travel']
     ],
@@ -74,12 +67,6 @@
     '/guidance/healthcare-for-eu-and-efta-citizens-visiting-the-uk': [
       ['Heading', 'Travel insurance']
     ],
-    '/guidance/driving-in-the-eu-after-brexit': [
-      ['Heading', 'GB stickers and number plates']
-    ],
-    '/guidance/driving-in-the-eu-after-brexit#insurance-for-your-vehicle-caravan-or-trailer': [
-      ['Heading', 'Trailer registration']
-    ],
     '/driving-abroad': [
       ['Heading', 'Check your insurance if you’re taking your own vehicle']
     ],
@@ -89,57 +76,15 @@
     '/driving-abroad/international-driving-permit': [
       ['Heading', 'Check which IDP you need']
     ],
-    '/guidance/driving-in-the-eu-after-brexit#gb-stickers-and-number-plates': [
-      ['Heading', 'GB stickers and number plates']
-    ],
     '/guidance/guidance-for-suppliers-of-cattle-sheep-and-goat-ear-tags': [
       ['Heading', 'Tagging information for livestock keepers']
     ],
-    '/guidance/wine-trade-regulations': [
-      ['Heading', 'Rules for transporting wine into the UK']
-    ],
-    '/guidance/the-chemicals-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Energy and climate']
-    ],
     '/guidance/how-to-move-goods-between-or-through-common-transit-countries-including-the-eu': [
       ['Heading', 'Start moving your goods']
     ],
     '/guidance/ecmt-international-road-haulage-permits': [
       ['Heading', 'Apply for permits']
     ],
-    '/guidance/prepare-to-drive-in-the-eu-after-brexit-lorry-and-goods-vehicle-drivers': [
-      ['Heading', 'Driver CPC for lorry drivers']
-    ],
-    '/guidance/run-international-bus-or-coach-services-after-brexit': [
-      ['Heading', 'Run regular international services']
-    ],
-    '/guidance/vehicle-type-approval-if-theres-no-brexit-deal': [
-      ['Heading', 'Existing vehicle and component type-approvals']
-    ],
-    '/guidance/the-retail-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Importing and exporting']
-    ],
-    '/guidance/the-consumer-goods-sector-and-preparing-for-eu-exit': [
-      ['Heading', 'Importing and exporting']
-    ],
-    '/government/publications/banking-insurance-and-other-financial-services-if-theres-no-brexit-deal/banking-insurance-and-other-financial-services-if-theres-no-brexit-deal-information-for-financial-services-institutions': [
-      ['Heading', '3. Action taken by the UK']
-    ],
-    '/government/publications/further-guidance-note-on-the-regulation-of-medicines-medical-devices-and-clinical-trials-if-theres-no-brexit-deal/further-guidance-note-on-the-regulation-of-medicines-medical-devices-and-clinical-trials-if-theres-no-brexit-deal': [
-      ['Heading', '1.4 Orphan medicines']
-    ],
-    '/guidance/check-temporary-rates-of-customs-duty-on-imports-after-eu-exit': [
-      ['Heading', 'Tariff-rate quotas (TRQ)']
-    ],
-    '/guidance/construction-products-regulation-if-there-is-no-brexit-deal': [
-      ['Heading', 'UK manufacturers exporting to the EU']
-    ],
-    '/guidance/european-and-domestic-funding-after-brexit': [
-      ['Heading', 'What you need to do']
-    ],
-    '/guidance/guidance-on-substantial-amendments-to-a-clinical-trial-if-the-uk-leaves-the-eu-with-no-deal': [
-      ['Heading', 'Investigational medicinal product (IMP) certification and importation']
-    ],
     '/taking-goods-out-uk-temporarily/get-an-ata-carnet': [
       ['Heading', 'Using an ATA Carnet']
     ],

data/app/assets/javascripts/govuk_publishing_components/components/intervention.js

@@ -8,6 +8,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Intervention.prototype.init = function () {
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
+      // Send a tracking event when this component is shown
       window.GOVUK.analytics.trackEvent('interventionBanner', 'interventionShown')
     }
   }

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

@@ -94,13 +94,19 @@
 
 .gem-c-action-link--blue-arrow {
   &:before {
-    width: 45px;
-    height: 35px;
+    width: 36px;
+    height: 28px;
     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: 35px auto;
+    background-size: 28px auto;
     background-position: 0 0;
+
+    @include govuk-media-query($from: tablet) {
+      width: 45px;
+      height: 35px;
+      background-size: 35px auto;
+    }
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_big-number.scss

@@ -38,4 +38,12 @@
       @include govuk-link-hover-decoration;
     }
   }
+
+  &:focus,
+  &:focus:hover {
+    .gem-c-big-number__label,
+    .gem-c-big-number__value--decorated {
+      text-decoration: none;
+    }
+  }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_input.scss

@@ -1,8 +1,18 @@
 @import "govuk/components/input/input";
+$search-icon-size: 40px;
 
-.gem-c-input--search-icon {
-  background: govuk-colour("white") url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='currentColor'%3E%3C/path%3E%3C/svg%3E") no-repeat -5px -3px;
-  padding-left: govuk-spacing(6);
+.gem-c-input__search-icon {
+  display: block;
+  position: relative;
+  margin-bottom: -$search-icon-size;
+  z-index: 1;
+  width: $search-icon-size;
+  height: $search-icon-size;
+  @if $govuk-typography-use-rem {
+    margin-bottom: -(govuk-px-to-rem($search-icon-size));
+    height: govuk-px-to-rem($search-icon-size);
+  }
+  background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='currentColor'%3E%3C/path%3E%3C/svg%3E") no-repeat -3px center;
 }
 
 // this overrides styles from static that break the look of the component
@@ -14,7 +24,7 @@
   padding: govuk-spacing(1);
   box-sizing: border-box;
 
-  &.gem-c-input--search-icon {
+  &.gem-c-input--with-search-icon {
     padding-left: govuk-spacing(6);
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_intervention.scss

@@ -1,18 +1,21 @@
 .gem-c-intervention {
   @include govuk-text-colour;
-  @include govuk-responsive-padding(6, "left");
-  @include govuk-responsive-padding(6, "right");
-  @include govuk-responsive-padding(4, "top");
-  @include govuk-responsive-padding(4, "bottom");
+  @include govuk-responsive-padding(3);
   @include govuk-responsive-margin(6, "bottom");
   background-color: govuk-colour("light-grey", $legacy: "grey-4");
-
-  .gem-c-intervention__title {
-    @include govuk-responsive-margin(0);
-    @include govuk-responsive-padding(4, "bottom");
-  }
+  border-left: 10px solid $govuk-success-colour;
 
   .govuk-body:last-of-type {
-    @include govuk-responsive-margin(0, "bottom");
+    margin-bottom: 0;
   }
 }
+
+.gem-c-intervention__textwrapper {
+  display: block;
+}
+
+.gem-c-intervention__dismiss-icon {
+  width: 1em;
+  height: 1em;
+  margin-bottom: -2px;
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -52,15 +52,3 @@ $current-indicator-width: 4px;
     color: $govuk-link-colour;
   }
 }
-
-.gem-c-layout-for-public-account-feedback-footer {
-  margin-bottom: govuk-spacing(4);
-  padding: govuk-spacing(3);
-  background: govuk-colour("light-grey");
-
-  @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(6);
-    margin-top: govuk-spacing(2);
-    margin-bottom: govuk-spacing(8);
-  }
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss

@@ -85,6 +85,19 @@ $large-input-size: 50px;
   }
 }
 
+@mixin icon-positioning($container-size) {
+  $icon-dimension: 20px;
+  $icon-position: ($container-size - $icon-dimension) / 2;
+
+  display: block;
+  pointer-events: none;
+  position: absolute;
+  height: $icon-dimension;
+  width: $icon-dimension;
+  top: $icon-position;
+  left: $icon-position;
+}
+
 .gem-c-search__submit {
   border: 0;
   cursor: pointer;
@@ -93,15 +106,11 @@ $large-input-size: 50px;
   padding: 0;
   width: $input-size;
   height: $input-size;
-  background-image: image-url("govuk_publishing_components/search-button.png");
-  background-repeat: no-repeat;
-  background-position: 2px 50%;
   text-indent: -5000px;
   overflow: hidden;
 
-  @include govuk-device-pixel-ratio {
-    background-size: 52.5px auto;
-    background-position: 115% 50%;
+  .gem-c-search__icon {
+    @include icon-positioning($input-size);
   }
 
   &:focus {
@@ -222,11 +231,9 @@ $large-input-size: 50px;
   .gem-c-search__submit {
     width: $large-input-size;
     height: $large-input-size;
-    background-position: 8px 50%;
 
-    @include govuk-device-pixel-ratio {
-      background-size: 60px auto;
-      background-position: 160% 50%;
+    .gem-c-search__icon {
+      @include icon-positioning($large-input-size);
     }
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/print/_organisation-logo.scss

@@ -0,0 +1,3 @@
+.gem-c-organisation-logo__image {
+  max-width: 100%;
+}

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -31,9 +31,14 @@ module GovukPublishingComponents
 
       gem_path = Gem.loaded_specs["govuk_publishing_components"].full_gem_path
       gem_path = Dir.pwd if ENV["MAIN_COMPONENT_GUIDE"]
+      host_dir = File.expand_path("..")
+      path = File.expand_path("..", gem_path)
+
+      @in_application = false
+      @in_application = true unless path.to_s == host_dir.to_s
 
       components = AuditComponents.new(gem_path, false)
-      applications = analyse_applications(File.expand_path("..", gem_path), application_dirs)
+      applications = analyse_applications(host_dir, application_dirs)
       compared_data = AuditComparer.new(components.data, applications, false)
 
       @applications = compared_data.applications_data || []
@@ -44,15 +49,18 @@ module GovukPublishingComponents
 
     def analyse_applications(path, application_dirs)
       results = []
-      @applications_found = false
+      applications_found = 0
 
       application_dirs.each do |application|
         application_path = [path, application].join("/")
         app = AuditApplications.new(application_path, application)
-        @applications_found = true if app.data[:application_found]
+        applications_found += 1 if app.data[:application_found]
         results << app.data
       end
 
+      @other_applications = false
+      @other_applications = true if applications_found > 1
+
       results
     end
   end

data/app/views/govuk_publishing_components/audit/_components.html.erb

@@ -1,4 +1,4 @@
-<% if @applications_found %>
+<% if @other_applications %>
   <%= render "govuk_publishing_components/components/heading", {
     text: "Components",
     font_size: "l",
@@ -101,7 +101,7 @@
     }
   %>
 
-  <% if @applications_found %>
+  <% if @other_applications %>
     <% components_by_application = capture do %>
       <% if @components[:components_by_application].any? %>
         <dl class="govuk-summary-list">

data/app/views/govuk_publishing_components/audit/show.html.erb

@@ -10,7 +10,7 @@
   <%= render "components" %>
 <% end %>
 
-<% if @applications_found %>
+<% if @in_application or @other_applications %>
   <%= render "govuk_publishing_components/components/tabs", {
     tabs: [
       {

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

@@ -4,6 +4,7 @@
   label ||= nil
   href ||= nil
   data_attributes ||= nil
+  aria ||= nil
   classes = ["gem-c-big-number__value"]
   
   if label.nil? && href
@@ -25,7 +26,7 @@
     <% end %>
   <% end %>
   
-  <%= tag.div class: "gem-c-big-number" do %>
+  <%= tag.div class: "gem-c-big-number", aria: aria do %>
     <% unless href.nil? %>
       <%= link_to big_number_value, href, class: "govuk-link gem-c-big-number__link", data: data_attributes %>
     <% else %>

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

@@ -31,7 +31,7 @@
   css_classes = %w(gem-c-input govuk-input)
   css_classes << "govuk-input--error" if has_error
   css_classes << "govuk-input--width-#{width}" if [2, 3, 4, 5, 10, 20, 30].include?(width)
-  css_classes << "gem-c-input--search-icon" if search_icon
+  css_classes << "gem-c-input--with-search-icon" if search_icon
   form_group_css_classes = %w(govuk-form-group)
   form_group_css_classes << "govuk-form-group--error" if has_error && !grouped
 
@@ -120,6 +120,7 @@
       <%= input_tag %><%= tag.span suffix, class: "govuk-input__suffix", aria: { hidden: true } %>
     <% end %>
   <% else %>
+    <%= tag.span class: "gem-c-input__search-icon" if search_icon %>
     <%= input_tag %>
   <% end %>
 <% end %>

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

@@ -1,33 +1,46 @@
 <%
+  dismiss_text ||= false
+  suggestion_link_text ||= false
+  suggestion_link_url ||= false
+  suggestion_text ||= nil
+
   data_attributes ||= {}
   data_attributes[:module] = 'intervention'
-%>
+  suggestion_data_attributes ||= {}
+  dismiss_data_attributes ||= {}
+
+  aria_attributes ||= {}
+  aria_attributes[:label] = 'Intervention'
 
-<%= tag.section class: "gem-c-intervention", role: "region", data: data_attributes do %>
-  <h2 class="gem-c-intervention__title govuk-heading-s">
-    <a class="govuk-link" href="/next-steps-for-your-business"
-      data-module="gem-track-click"
-      data-track-category="interventionBanner"
-      data-track-action="interventionClicked"
-      data-track-dimension="<%= t("components.intervention.title") %>"
-      data-track-dimension-index="29"
-      data-track-label="/next-steps-for-your-business">
-      <%= t("components.intervention.title") %></a>
-  </h2>
+  local_assigns[:query_string] ||= request.query_string
+
+  intervention_helper = GovukPublishingComponents::Presenters::InterventionHelper.new(local_assigns)
+  dismiss_href = intervention_helper.dismiss_link
+%>
+<% if suggestion_text or (suggestion_link_text and suggestion_link_text) %>
+  <%= tag.section class: "gem-c-intervention", role: "region", aria: aria_attributes, data: data_attributes do %>
+    <p class="govuk-body">
+      <%= tag.span suggestion_text, class: "gem-c-intervention__textwrapper" if suggestion_text %>
+      <% if suggestion_link_text and suggestion_link_url %>
+        <%= tag.a suggestion_link_text, class: "govuk-link gem-c-intervention__suggestion-link", href: suggestion_link_url, data: suggestion_data_attributes %>
 
-  <p class="govuk-body">
-    <%= t("components.intervention.description") %>
-  </p>
+      <% end %>
+    </p>
 
-  <p class="govuk-body">
-    <a class="govuk-link" href="?hide-intervention=true"
-      data-module="gem-track-click"
-      data-track-category="interventionBanner"
-      data-track-action="interventionDismissed"
-      data-track-label="?hide-intervention=true"
-      data-track-dimension="<%= t("components.intervention.dismiss_link_text") %>"
-      data-track-dimension-index="29">
-      <%= t("components.intervention.dismiss_link_text") %></a>
-    <%= t("components.intervention.dismiss_post_link") %>
-  </p>
+    <% if dismiss_text %>
+      <p class="govuk-body">
+        <%= tag.a class: "govuk-link gem-c-intervention__dismiss", href: dismiss_href, data: dismiss_data_attributes do %>
+          <svg class="gem-c-intervention__dismiss-icon"
+            width="19" height="19" viewBox="0 0 19 19"
+            aria-hidden="true"
+            fill="none" stroke="currentColor">
+            <path d="M0.499997 9.5C0.499997 4.52944 4.52944 0.499999 9.5 0.499999C14.4706 0.5 18.5 4.52944 18.5 9.5C18.5 14.4706 14.4706 18.5 9.5 18.5C4.52943 18.5 0.499997 14.4706 0.499997 9.5Z"/>
+            <path d="M13.3477 5.4209L9.67383 9.09473L6 5.4209"/>
+            <path d="M6 13.4209L9.67383 9.74707L13.3477 13.4209"/>
+          </svg>
+          <%= dismiss_text %>
+        <% end %>
+      </p>
+    <% end %>
+  <% end %>
 <% end %>

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

@@ -17,7 +17,6 @@
 
   show_account_layout ||= false
   account_nav_location ||= nil
-  omit_account_feedback_footer ||= false
   omit_account_navigation ||= false
   omit_account_phase_banner ||= false
 
@@ -136,9 +135,7 @@
       </div>
     <% end %>
 
-    <% if show_account_layout && !omit_account_feedback_footer %>
-      <%= render "govuk_publishing_components/components/layout_for_public/account-feedback-footer" %>
-    <% elsif !omit_feedback_form %>
+    <% unless omit_feedback_form %>
       <div class="govuk-width-container">
         <%= render "govuk_publishing_components/components/feedback" %>
       </div>

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

@@ -213,30 +213,10 @@
         <span class="govuk-visually-hidden">
           <%= search_text %>
         </span>
-        <svg
-          class="gem-c-layout-super-navigation-header__search-toggle-button-link-icon"
-          width="27"
-          height="27"
-          viewBox="0 0 27 27"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-          aria-hidden="true"
-          focusable="false"
-        >
-          <circle
-            cx="10.0161"
-            cy="10.0161"
-            r="8.51613"
-            stroke="currentColor"
-            stroke-width="3" />
-          <line
-            x1="15.8668"
-            y1="16.3587"
-            x2="25.4475"
-            y2="25.9393"
-            stroke="currentColor"
-            stroke-width="3" />
-        </svg>
+        <%=
+          render "govuk_publishing_components/components/search/search_icon",
+            classes: %W[gem-c-layout-super-navigation-header__search-toggle-button-link-icon]
+        %>
       </button>
 
       <div id="super-search-menu" class="gem-c-layout-super-navigation-header__search-items">

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

@@ -6,10 +6,15 @@
   list_type ||= "unordered"
   visible_counters ||= nil
 
+  shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
+
   classes = %w[gem-c-list govuk-list]
-  classes << "govuk-list--bullet" if visible_counters && list_type === "unordered"
-  classes << "govuk-list--number" if visible_counters && list_type === "number"
+  classes << "govuk-list--bullet" if visible_counters and list_type === "unordered"
+  classes << "govuk-list--number" if visible_counters and list_type === "number"
   classes << "govuk-list--spaced" if extra_spacing
+  # Setting the  `margin_bottom` to 4 is the same as the default margin - so we
+  # can omit the override class. To do this we leave out `4` from the array:
+  classes << (shared_helper.get_margin_bottom) if [0,1,2,3,5,6,7,8,9].include?(local_assigns[:margin_bottom])
 
   # Default list type is unordered list.
   list_tag = "ul"

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

@@ -53,6 +53,7 @@
     <div class="gem-c-search__item gem-c-search__submit-wrapper">
       <%= tag.button class: "gem-c-search__submit", type: "submit", data: data_attributes do %>
         <%= button_text %>
+        <%= render "govuk_publishing_components/components/search/search_icon" %>
       <% end %>
     </div>
   </div>

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

@@ -54,3 +54,10 @@ examples:
       label: Ministerial departments
       data_attributes:
         department-count: true
+  with_aria_attributes:
+    description: Aria attributes are applied to the whole component instance
+    data:
+      number: 23
+      label: Ministerial departments
+      aria:
+        hidden: true

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

@@ -439,16 +439,16 @@ examples:
   statistic_headlines:
     data:
       block: |
-        <aside class="stat-headline">
+        <div class="stat-headline">
           <p><em>£6bn</em>
           Total Departmental Expenditure Limit (<abbr title="Departmental Expenditure Limit">DEL</abbr>) in financial year 2015 to 2016</p>
-        </aside>
+        </div>
         <p>This includes £5.8 billion Resource <abbr title="Departmental Expenditure Limit">DEL</abbr> and £0.2 billion Capital <abbr title="Departmental Expenditure Limit">DEL</abbr>. In addition, <abbr title="Department for Work and Pensions">DWP</abbr> Annually Managed Expenditure (<abbr title="Annually Managed Expenditure">AME</abbr>) in financial year 2015 to 2016 is £170.5 billion, as forecast by the Office for Budget Responsibility.</p>
-        <aside class="stat-headline">
+        <div class="stat-headline">
           <p>UK employment rate
           <em>74.1%</em>
           between October and December 2015</p>
-        </aside>
+        </div>
   specialist_content:
     data:
       block: |

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

@@ -6,19 +6,58 @@ body: |
   that would be useful to them. This component would be used to add this personalised content and would
   indicate to the user that this is not normally part of the page, but has been added for them specifically.
 
-  Right now the contents of the component are static, as the MVP of personalised content is only for Start a Business.
-  Since many pages will use this component with the same text, we hard-code it here for now.
+  The dismiss link points to the current URL with the "hide-intervention" query string parameter set to "true". The backend should check for this string in order to render the same page without the intervention.
 
-  The dismiss link will reload the page but the `hide-intervention` query string parameter will cause the
-  backed not to show the intervention again. Some progressive enhancement will be added in later to avoid
-  reloading the page if JavaScript is available.
 accessibility_criteria: |
   The intervention component must:
 
   - have a border colour contrast ratio of more than 4.5:1 with its background to be visually distinct
+  - prevent screen readers from announcing the dismiss link icon
+
 
-  - always render headings with associated description content, so there are no isolated heading elements inside the component
 shared_accessibility_criteria:
   - link
 examples:
   default:
+    data:
+      suggestion_text: "You should renew your permit every 6 months."
+
+  with_suggestion_link:
+    data:
+      suggestion_text: "Based on your browsing you might be interested in"
+      suggestion_link_text: "Travel abroad: step by step"
+      suggestion_link_url: "/travel-abroad"
+
+  with_dismiss_link:
+    data:
+      suggestion_text: "You should renew your permit every 6 months."
+      dismiss_text: "Hide this suggestion"
+
+  with_suggestion_link_only:
+    data:
+      suggestion_link_text: "You can now apply for a permit online."
+      suggestion_link_url: "/permit"
+
+  with_data_attributes:
+    description: |
+      This example shows the use of `suggestion_data_attributes` and
+      `dismiss_data_attributes` for click tracking.
+    data:
+      suggestion_text: "Based on your browsing you might be interested in"
+      suggestion_link_text: "Travel abroad: step by step"
+      suggestion_link_url: "/travel-abroad"
+      suggestion_data_attributes:
+        module: "gem-track-click"
+        track-category: "interventionBanner"
+        track-action: "interventionClicked"
+        track-dimension: "Travel abroad: step by step"
+        track-dimension-index: "29"
+        track-label: "clicked suggestion"
+      dismiss_text: "Hide this suggestion"
+      dismiss_data_attributes:
+        module: "gem-track-click"
+        track-category: "interventionBanner"
+        track-action: "interventionDismissed"
+        track-dimension: "Hide this suggestion"
+        track-dimension-index: "29"
+        track-label: "hid the intervention"

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

@@ -68,14 +68,6 @@ examples:
       block: |
         <h2 class="govuk-heading-l">This is a title</h2>
         <p class="govuk-body">This is some body text with <a href="https://example.com">a link</a>.
-  with_account_layout_but_without_account_feedback_footer:
-    description: The account layout renders with an account-specific feedback banner by default. This flag allows this banner to be omitted.
-    data:
-      show_account_layout: true
-      omit_account_feedback_footer: true
-      block: |
-        <h2 class="govuk-heading-l">This is a title</h2>
-        <p class="govuk-body">This is some body text with <a href="https://example.com">a link</a>.</p>
   with_current_account_navigation:
     description: "The account layout renders with an account-specific nav to help users navigate different areas of their account. This flag is here to allow control over which option in the nav is highlighted as `current`. Valid options are currently `your-account`, `manage`, and `security`."
     data:

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

@@ -62,3 +62,11 @@ examples:
     data:
       id: 'super-fantastic-chocolate-list'
       <<: *default-example-data
+  with_margin:
+    description: |
+      Sets the margin on the bottom of the list element.
+
+      The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to having a 20px margin.
+    data:
+      margin_bottom: 9
+      <<: *default-example-data

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

@@ -11,7 +11,7 @@ accessibility_criteria: |
   - be focusable with a keyboard
   - be usable with a keyboard
   - indicate when they have focus
-  - change in appearance when touched (in the touch-down state)
+  - change in appearance when active (in the active state)
   - be usable with touch
   - have label with a touch area similar to the input
   - be usable with [voice commands](https://www.w3.org/WAI/perspectives/voice.html)
@@ -53,7 +53,7 @@ examples:
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
   with_bold:
-    description: 'Used to provide better contrast between long labels and hint text, Note that the `:or` option [is documented as a string due to a bug](https://github.com/alphagov/govuk_publishing_components/issues/102)'
+    description: Used to provide better contrast between long labels and hint text, Note that the `:or` option [is documented as a string due to a bug](https://github.com/alphagov/govuk_publishing_components/issues/102)
     data:
       name: "radio-group-bold"
       items:
@@ -66,7 +66,7 @@ examples:
         hint_text: "You'll have an account if you've already proved your identity with a certified company, such as the Post Office."
         bold: true
   with_bottom_margin:
-    description: "The component accepts a number for margin bottom from 0 to 9 (0px to 60px) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to a margin bottom of 30px (6)."
+    description: The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to a margin bottom of `30px` (`6`).
     data:
       name: "radio-group"
       margin_bottom: 9
@@ -85,16 +85,50 @@ examples:
         text: "Use Government Gateway"
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
-  with_heading:
-    description: This adds a legend element containing the text supplied.
+  with_legend:
+    description: |
+      Legend text is automatically wrapped inside a `h2`. To render the text without it, `heading_level` must be set to `0`.
     data:
-      name: "radio-group-heading"
-      heading: "Are you hungry?"
+      name: "radio-group-legend"
+      heading: "What's it to do with?"
+      heading_level: 0
       items:
       - value: "yes"
         text: "Yes"
       - value: "no"
         text: "No"
+  with_heading:
+    description: |
+      By default, text supplied for the `legend` is wrapped inside a `h2`. 
+      
+      The font size of this heading can be changed using the `heading_size` option. Valid options are `s`, `m`, `l`, `xl`, defaulting to `m` if no option is passed.
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      heading_size: "s"
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
+  with_different_heading_level:
+    description: |
+      By default, text supplied for the `legend` is wrapped inside a `h2`. This can be changed using the `heading_level` option.
+        
+      If `heading_level` is `1` and `heading_size` is not set, the text size will be `xl`.
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      heading_level: 1
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
   with_heading_and_hint:
     data:
       name: "radio-group-heading"
@@ -109,9 +143,9 @@ examples:
         text: "Blue"
   with_page_header_and_caption:
     description: |
-      If a caption text is provided with a page heading, it will be displayed above the heading.
-      A caption can only be used with a page heading. If a heading is not provided the caption will not render.
-      The pattern is used across GOV.UK to show a high-level section that this page question falls into.
+      A caption can be added using the `heading_caption` option. Captions will only be displayed if text for the heading option is present.
+      
+      The pattern is used across GOV.UK to show a high-level section that this page belongs to.
     data:
       name: "radio-group-heading"
       heading: "Is it snowing?"
@@ -181,35 +215,6 @@ examples:
         text: "Green"
       - value: "blue"
         text: "Blue"
-  with_custom_heading_size:
-    description: |
-      This allows the size of the legend to be changed. Valid options are s, m, l, xl, defaulting to m if no option is passed.
-
-      If heading_level is 1 and heading_size is not set, the text size will be xl.
-    data:
-      name: "radio-group-description"
-      heading: "What is your favourite colour?"
-      heading_size: "s"
-      items:
-      - value: "red"
-        text: "Red"
-      - value: "green"
-        text: "Green"
-      - value: "blue"
-        text: "Blue"
-  with_custom_heading_level:
-    description: This allows the heading level to be changed. Heading level will default to `h2` if nothing is passed.
-    data:
-      name: "radio-group-description"
-      heading: "What is your favourite colour?"
-      heading_level: 3
-      items:
-      - value: "red"
-        text: "Red"
-      - value: "green"
-        text: "Green"
-      - value: "blue"
-        text: "Blue"
   with_hint_text_on_radios:
     data:
       name: "radio-group-hint-text"
@@ -248,7 +253,7 @@ examples:
       - value: "govuk-verify"
         text: "Use GOV.UK Verify"
   with_or_divider:
-    description: "See [related service manual gudiance for this pattern](https://www.gov.uk/service-manual/design/writing-for-user-interfaces#ask-questions-that-users-can-understand)"
+    description: "See [related service manual guidance for this pattern](https://www.gov.uk/service-manual/design/writing-for-user-interfaces#ask-questions-that-users-can-understand)"
     data:
       name: "radio-group-or-divider"
       items:

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

@@ -62,17 +62,6 @@ examples:
       margin_bottom: 0
     context:
       dark_background: true
-  in_html_publication_with_context_link:
-    description: Page titles are used in HTML Publications ([see example](https://www.gov.uk/government/publications/fees-for-civil-and-family-courts/court-fees-for-the-high-court-county-court-and-family-court))
-    data:
-      context:
-        text: Publication
-        href: '/link'
-      title: HTML publication page title
-      inverse: true
-      margin_bottom: 0
-    context:
-      dark_background: true
   using_design_system_template:
     description: |
       This option allows the removal of top margin from the component so that it works within a [Design System page template](https://design-system.service.gov.uk/styles/page-template/default/index.html), where spacing above the title is already provided by padding on the wrapping div.

data/app/views/govuk_publishing_components/components/layout_for_public/_account-layout.html.erb

@@ -8,7 +8,7 @@
   <% end %>
 
   <%= render "govuk_publishing_components/components/phase_banner", {
-    phase: "alpha",
+    phase: "beta",
     message: message
   } unless omit_account_phase_banner %>
 

data/app/views/govuk_publishing_components/components/layout_for_public/_account-navigation.html.erb

@@ -19,14 +19,5 @@
         data: { module: "explicit-cross-domain-links" },
       ) %>
     </li>
-    <li class="gem-c-layout-for-public-account-menu__item <%= "gem-c-layout-for-public-account-menu__item--current" if page_is == "security" %>">
-      <%= link_to(
-        t("components.layout_for_public.account_layout.navigation.menu_bar.security.link_text"),
-        GovukPersonalisation::Urls.security,
-        class: 'gem-c-layout-for-public-account-menu__link govuk-link govuk-link--no-visited-state',
-        'aria-current': page_is == "security" ? "page" : nil,
-        data: { module: "explicit-cross-domain-links" },
-      ) %>
-    </li>
   </ul>
 </nav>

data/app/views/govuk_publishing_components/components/search/_search_icon.html.erb

@@ -0,0 +1,28 @@
+<%
+  classes ||= %w[gem-c-search__icon]
+%>
+
+<svg
+  class="<%= classes.join(" ") %>"
+  width="27"
+  height="27"
+  viewBox="0 0 27 27"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
+  aria-hidden="true"
+  focusable="false"
+>
+  <circle
+    cx="10.0161"
+    cy="10.0161"
+    r="8.51613"
+    stroke="currentColor"
+    stroke-width="3" />
+  <line
+    x1="15.8668"
+    y1="16.3587"
+    x2="25.4475"
+    y2="25.9393"
+    stroke="currentColor"
+    stroke-width="3" />
+</svg>

data/config/locales/en.yml

@@ -53,7 +53,7 @@ en:
         two_words: " and "
       type:
         consultation: Consultation for %{nation}
-        detailed_guide: Guidance for %{nation} 
+        detailed_guide: Guidance for %{nation}
         guidance: Guidance for %{nation}
         publication: Publication for %{nation}
       england: England
@@ -86,11 +86,6 @@ en:
       news_and_communications: News and communications
       statistics: Statistics
       worldwide: Worldwide
-    intervention:
-      title: Check the next steps for your limited company
-      description: You might be interested in this because you’ve been browsing guidance relevant to starting a limited company.
-      dismiss_link_text: Hide this suggestion
-      dismiss_post_link: if it’s not relevant to you
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: All content is available under the <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
@@ -99,13 +94,9 @@ en:
       account_layout:
         feedback:
           banners:
-            footer_intro: We’re trialling GOV.UK accounts.
-            footer_link: Give feedback
-            footer_outro: on your experience so we can make them better.
             phase_intro: We’re trialling GOV.UK accounts - your
             phase_link: feedback
             phase_outro: will help us improve them.
-            title: Help improve GOV.UK accounts
         navigation:
           destroy_user_session: Sign out
           menu_bar:
@@ -113,8 +104,6 @@ en:
               link_text: Your account
             manage:
               link_text: Manage your account
-            security:
-              link_text: Security and privacy
           user_root_path: Account
     layout_header:
       hide_button: Hide search

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -4,18 +4,12 @@ module GovukPublishingComponents
       # keys are labels, values are the content_ids for the matching taxons
       # Where multiple matching taxons are present, the top most one is the highest priority
       #   and the bottom one the lowest priority
-      BREXIT_TAXONS = {
+      PRIORITY_TAXONS = {
         brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
         brexit_individuals: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
         brexit_taxon: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
-      PRIORITY_TAXONS = {
-        education_coronavirus: "272308f4-05c8-4d0d-abc7-b7c2e3ccd249",
-        worker_coronavirus: "b7f57213-4b16-446d-8ded-81955d782680",
-        business_coronavirus: "65666cdf-b177-4d79-9687-b9c32805e450",
-      }.merge(BREXIT_TAXONS).freeze
-
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item, query_parameters = nil)
         new(content_item, query_parameters).breadcrumbs
@@ -37,9 +31,9 @@ module GovukPublishingComponents
 
       def priority_brexit_taxon
         if tagged_to_both_brexit_child_taxons?
-          priority_brexit_taxons.find { |t| t["content_id"] == BREXIT_TAXONS[:brexit_taxon] }
+          priority_taxons.find { |t| t["content_id"] == PRIORITY_TAXONS[:brexit_taxon] }
         else
-          priority_brexit_taxons.min_by { |t| BREXIT_TAXONS.values.index(t["content_id"]) }
+          priority_taxons.min_by { |t| PRIORITY_TAXONS.values.index(t["content_id"]) }
         end
       end
 
@@ -83,10 +77,6 @@ module GovukPublishingComponents
         end
       end
 
-      def priority_brexit_taxons
-        priority_taxons.select { |t| priority_brexit_taxon?(t) }
-      end
-
       def taxon_tree(taxons)
         return [] if taxons.blank?
 
@@ -97,10 +87,6 @@ module GovukPublishingComponents
         PRIORITY_TAXONS.values.include?(taxon["content_id"])
       end
 
-      def priority_brexit_taxon?(taxon)
-        BREXIT_TAXONS.values.include?(taxon["content_id"])
-      end
-
       def brexit_child_taxon?(taxon)
         brexit_child_taxons.include?(taxon["content_id"])
       end

data/lib/govuk_publishing_components/presenters/intervention_helper.rb

@@ -0,0 +1,19 @@
+module GovukPublishingComponents
+  module Presenters
+    class InterventionHelper
+      attr_reader :query_string
+
+      def initialize(local_assigns)
+        @query_string = local_assigns[:query_string]
+      end
+
+      def dismiss_link
+        if @query_string.present?
+          "#{@query_string}&hide-intervention=true"
+        else
+          "?hide-intervention=true"
+        end
+      end
+    end
+  end
+end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "27.7.0".freeze
+  VERSION = "27.9.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -30,6 +30,7 @@ require "govuk_publishing_components/presenters/schema_org"
 require "govuk_publishing_components/presenters/heading_helper"
 require "govuk_publishing_components/presenters/contents_list_helper"
 require "govuk_publishing_components/presenters/image_card_helper"
+require "govuk_publishing_components/presenters/intervention_helper"
 require "govuk_publishing_components/presenters/organisation_logo_helper"
 require "govuk_publishing_components/presenters/highlight_boxes_helper"
 require "govuk_publishing_components/presenters/taxonomy_list_helper"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 27.7.0
+  version: 27.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: jasmine_selenium_runner
   requirement: !ruby/object:Gem::Requirement
@@ -642,6 +642,7 @@ files:
 - app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak-html-publication.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_layout-super-navigation-header.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_organisation-logo.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav.scss
 - app/assets/stylesheets/govuk_publishing_components/components/print/_textarea.scss
@@ -835,7 +836,6 @@ files:
 - app/views/govuk_publishing_components/components/feedback/_problem_form.html.erb
 - app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb
 - app/views/govuk_publishing_components/components/feedback/_yes_no_banner.html.erb
-- app/views/govuk_publishing_components/components/layout_for_public/_account-feedback-footer.html.erb
 - app/views/govuk_publishing_components/components/layout_for_public/_account-layout.html.erb
 - app/views/govuk_publishing_components/components/layout_for_public/_account-navigation.html.erb
 - app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb
@@ -843,6 +843,7 @@ files:
 - app/views/govuk_publishing_components/components/layout_header/_search.html.erb
 - app/views/govuk_publishing_components/components/metadata/_sentence.html.erb
 - app/views/govuk_publishing_components/components/related_navigation/_section.html.erb
+- app/views/govuk_publishing_components/components/search/_search_icon.html.erb
 - app/views/layouts/govuk_publishing_components/application.html.erb
 - config/i18n-tasks.yml
 - config/initializers/assets.rb
@@ -942,6 +943,7 @@ files:
 - lib/govuk_publishing_components/presenters/heading_helper.rb
 - lib/govuk_publishing_components/presenters/highlight_boxes_helper.rb
 - lib/govuk_publishing_components/presenters/image_card_helper.rb
+- lib/govuk_publishing_components/presenters/intervention_helper.rb
 - lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/creative_work_schema.rb
 - lib/govuk_publishing_components/presenters/machine_readable/dataset_schema.rb

data/app/views/govuk_publishing_components/components/layout_for_public/_account-feedback-footer.html.erb

@@ -1,18 +0,0 @@
-<%= tag.div(class: "govuk-width-container") do %>
-  <%= tag.div(class: "gem-c-layout-for-public-account-feedback-footer") do %>
-    <%= render "govuk_publishing_components/components/heading", {
-      text: t("components.layout_for_public.account_layout.feedback.banners.title"),
-      heading_level: 2,
-      font_size: "m",
-      margin_bottom: 4,
-    } %>
-
-    <p class="govuk-body govuk-!-margin-bottom-0">
-      <%= t("components.layout_for_public.account_layout.feedback.banners.footer_intro") %>
-      <a href="<%= GovukPersonalisation::Urls.feedback %>" class="govuk-link">
-        <%= t("components.layout_for_public.account_layout.feedback.banners.footer_link") %>
-      </a>
-      <%= t("components.layout_for_public.account_layout.feedback.banners.footer_outro") %>
-    </p>
-  <% end %>
-<% end %>