Merge pull request #520 from alphagov/feature/closer-govuk-template-alignment

JC-DSIT · web-flow · commit 1786a5f3eccb · 2026-07-14T15:12:10.000+01:00
Closer alignment to govuk template
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Unreleased changes
+
+- Update[ template html syntax](https://github.com/alphagov/tech-docs-gem/pull/520) to more closely match gov.uk design template
+- bump govuk-frontend from [6.2.0 to 6.3.0](https://github.com/alphagov/tech-docs-gem/pull/517)
+
 ## 6.3.0
 
 - Bugfix [issue 258](https://github.com/alphagov/tech-docs-template/issues/258) - page layout structure to remove whitespace on short pages ([pull request 513](https://github.com/alphagov/tech-docs-gem/pull/513))  
diff --git a/lib/source/layouts/_footer.erb b/lib/source/layouts/_footer.erb
@@ -1,4 +1,4 @@
-<div class="govuk-footer app-footer" role="contentinfo">
+<div class="govuk-footer app-footer">
   <% if config[:tech_docs][:show_govuk_logo] %>
   <svg focusable="false" role="presentation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 60" height="30" width="32" fill="currentcolor" class="govuk-footer__crown">
     <g>
diff --git a/lib/source/layouts/_header.erb b/lib/source/layouts/_header.erb
@@ -1,4 +1,4 @@
-<div class="govuk-header app-header" role="banner" data-module="govuk-header">
+<div class="govuk-header app-header">
   <div class="govuk-header__container govuk-header__container--full-width">
     <div class="govuk-header__logo">
       <% if config[:tech_docs][:service_link] %>
diff --git a/lib/source/layouts/_service_navigation.erb b/lib/source/layouts/_service_navigation.erb
@@ -1,4 +1,5 @@
- <div class="govuk-width-container">
+<div class="govuk-service-navigation app-pane__navigation" data-module="govuk-service-navigation">
+<div class="govuk-width-container">
     <div class="govuk-service-navigation__container">
       <nav aria-label="Menu" class="govuk-service-navigation__wrapper">
         <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden aria-hidden="true">
@@ -20,3 +21,4 @@
       </nav>
     </div>
   </div>
+</div>
diff --git a/lib/source/layouts/core.erb b/lib/source/layouts/core.erb
@@ -50,13 +50,11 @@
 
   <body class="govuk-template__body">
     <script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
-    <header class="govuk-template__header app-header" role="banner" data-module="govuk-header">
+    <header class="govuk-template__header app-header">
       <%= partial 'layouts/header' %>
     </header>
     <% if config[:tech_docs][:header_links] %>
-      <div class="govuk-service-navigation app-pane__navigation" data-module="govuk-service-navigation">
         <%= partial 'layouts/service_navigation' %>
-      </div>
     <% end %>
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="govuk-footer app-footer" role="contentinfo">`
	`1`	`+<div class="govuk-footer app-footer">`
`2`	`2`	`<% if config[:tech_docs][:show_govuk_logo] %>`
`3`	`3`	`<svg focusable="false" role="presentation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 60" height="30" width="32" fill="currentcolor" class="govuk-footer__crown">`
`4`	`4`	`<g>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="govuk-header app-header" role="banner" data-module="govuk-header">`
	`1`	`+<div class="govuk-header app-header">`
`2`	`2`	`<div class="govuk-header__container govuk-header__container--full-width">`
`3`	`3`	`<div class="govuk-header__logo">`
`4`	`4`	`<% if config[:tech_docs][:service_link] %>`