Merge pull request #3863 from alphagov/move-the-skip-link-after-the-c…

…ookie-banner

Move the skip link after the cookie banner

CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## Unreleased
+
+* Move the skip link after the cookie banner ([PR #3863](https://github.com/alphagov/govuk_publishing_components/pull/3863))
+
 ## 37.3.0
 
 * Allow other applications to use GA4 code ([PR #3851](https://github.com/alphagov/govuk_publishing_components/pull/3851))

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

@@ -99,12 +99,10 @@
     <%= javascript_tag nonce: true do -%>
       document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
     <% end -%>
+    <%= render "govuk_publishing_components/components/cookie_banner", layout_helper.cookie_banner_data %>
     <%= render "govuk_publishing_components/components/skip_link", {
       href: "#content"
     } %>
-
-    <%= render "govuk_publishing_components/components/cookie_banner", layout_helper.cookie_banner_data %>
-
     <% unless omit_header %>
       <% if show_explore_header %>
         <% if homepage %>

spec/components/layout_for_public_spec.rb

@@ -295,4 +295,10 @@ def component_name
       expect(meta.first["content"]).to match(%r{^https?://})
     end
   end
+
+  it "has the skip link immediately after the cookie banner" do
+    render_component({})
+
+    assert_select ".gem-c-cookie-banner + .gem-c-skip-link"
+  end
 end