Merge pull request #2486 from alphagov/new-super-header

Add super navigation bar
alphagov · Jun 10, 2021 · 2d6f7b5 · 2d6f7b5
2 parents 0bb658b + f96c991
commit 2d6f7b5
Show file tree

Hide file tree

Showing 9 changed files with 282 additions and 38 deletions.
diff --git a/app/assets/images/search-icon--black.svg b/app/assets/images/search-icon--black.svg
diff --git a/app/assets/images/search-icon.svg b/app/assets/images/search-icon.svg
diff --git a/app/assets/stylesheets/components/_super-navigation-header.scss b/app/assets/stylesheets/components/_super-navigation-header.scss
@@ -0,0 +1,96 @@
+$breakpoint: 769px;
+
+.app-c-super-navigation-header,
+.app-c-super-navigation-header__container {
+  border-bottom: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+}
+
+.app-c-super-navigation-header__header-logo {
+  padding-top: govuk-spacing(2) + 4;
+  padding-bottom: govuk-spacing(2);
+  margin-bottom: 0;
+}
+
+.app-c-super-navigation-header__content {
+  @include govuk-media-query($from: $breakpoint) {
+    text-align: right;
+  }
+}
+
+.app-c-super-navigation-header__items {
+  margin-bottom: 0;
+
+  &.govuk-header__navigation {
+    @include govuk-media-query($from: $breakpoint) {
+      display: flex;
+      justify-content: flex-end;
+    }
+  }
+}
+
+.app-c-super-navigation-header__item {
+  display: flex;
+  margin-right: 0;
+  padding: 0;
+
+  @include govuk-media-query($from: $breakpoint) {
+    display: inline-flex;
+  }
+}
+
+.app-c-super-navigation-header__item-link {
+  padding: govuk-spacing(4) 0;
+  width: 100%;
+
+  @include govuk-media-query($from: $breakpoint) {
+    padding: govuk-spacing(3) + 2;
+    width: auto;
+  }
+}
+
+// Search
+
+.app-c-super-navigation-header__item--search {
+  @include govuk-media-query($from: $breakpoint) {
+    height: 55px;
+    width: 55px;
+    padding: 0;
+    margin-right: govuk-spacing(3);
+    background-color: govuk-colour('blue');
+  }
+}
+
+.app-c-super-navigation-header__item-link--search {
+  @include govuk-media-query($from: $breakpoint) {
+    background-image: image-url("search-icon.svg");
+    background-position: 50%;
+    background-size: 35%;
+    background-repeat: no-repeat;
+    display: inherit;
+    width: 55px;
+
+    &:focus {
+      background-image: image-url("search-icon--black.svg");
+    }
+  }
+}
+
+.app-c-super-navigation-header__item-link-text--search {
+  @include govuk-media-query($from: $breakpoint) {
+    display: block;
+    text-indent: -5000px;
+    overflow: hidden;
+  }
+}
+
+.app-c-super-navigation-header__menu-button {
+  font-size: 19px;
+  font-weight: bold;
+  line-height: 1.3;
+  border-left: 1px solid govuk-colour("mid-grey");
+  border-right: 1px solid govuk-colour("mid-grey");
+  padding: govuk-spacing(3) govuk-spacing(4);
+  top: 0;
+}
diff --git a/app/assets/stylesheets/header-footer-only.scss b/app/assets/stylesheets/header-footer-only.scss
@@ -13,6 +13,7 @@ $govuk-use-legacy-palette: false;
 
 @import "components/emergency-banner";
 @import "components/global-bar";
+@import "components/super-navigation-header";
 @import "components/survey";
 
 // basic styles for HTML5 and other elements

diff --git a/app/views/components/super-navigation-header/_header-content.html.erb b/app/views/components/super-navigation-header/_header-content.html.erb
@@ -0,0 +1,21 @@
+<div class="govuk-header__content app-c-super-navigation-header__content">
+  <button type="button" class="govuk-header__menu-button govuk-js-header-toggle app-c-super-navigation-header__menu-button" aria-controls="navigation" aria-label="Show or hide navigation menu">
+    Menu
+  </button>
+  <nav>
+    <ul id="navigation" class="govuk-header__navigation app-c-super-navigation-header__items" aria-label="Navigation menu">
+      <% navigation_links.each do | link | %>
+        <li class="govuk-header__navigation-item app-c-super-navigation-header__item">
+          <a class="govuk-header__link app-c-super-navigation-header__item-link" href="<%= link["href"] %>">
+            <%= link["label"] %>
+          </a>
+        </li>
+      <% end %>
+      <li class="govuk-header__navigation-item app-c-super-navigation-header__item app-c-super-navigation-header__item--search">
+          <a class="govuk-header__link app-c-super-navigation-header__item-link app-c-super-navigation-header__item-link--search" href="/search">
+            <span class="app-c-super-navigation-header__item-link-text--search">Search</span>
+          </a>
+        </li>
+    </ul>
+  </nav>
+</div>
diff --git a/app/views/components/super-navigation-header/_header-logo.html.erb b/app/views/components/super-navigation-header/_header-logo.html.erb
@@ -0,0 +1,33 @@
+<div class="govuk-header__logo app-c-super-navigation-header__header-logo">
+  <a href="<%= content_for?(:homepage_url) ? yield(:homepage_url) : "https://www.gov.uk/" %>"
+      title="<%= content_for?(:logo_link_title) ? yield(:logo_link_title) : "Go to the GOV.UK homepage" %>"
+      class="content govuk-header__link govuk-header__link--homepage"
+      id="logo"
+      data-module="gem-track-click"
+      data-track-category="homeLinkClicked"
+      data-track-action="homeHeader">
+    <span class="govuk-header__logotype">
+      <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>
+        <image src="<%= asset_path 'gov.uk_logotype_crown_invert_trans.png' %>"
+                xlink:href=""
+                class="govuk-header__logotype-crown-fallback-image"
+                width="36"
+                height="32">
+        </image>
+      </svg>
+      <span class="govuk-header__logotype-text">
+        <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
+      </span>
+    </span>
+  </a>
+</div>
diff --git a/app/views/components/super-navigation-header/_super-navigation-header.html.erb b/app/views/components/super-navigation-header/_super-navigation-header.html.erb
@@ -0,0 +1,10 @@
+<%
+  navigation_links = YAML.load(File.read(File.join(File.dirname(__FILE__),"/navigation-links.yml")))
+%>
+
+<header role="banner" data-module="govuk-header" class="govuk-header app-c-super-navigation-header <%= yield(:header_class) %>">
+  <div class="govuk-header__container app-c-super-navigation-header__container govuk-width-container">
+    <%= render "components/super-navigation-header/header-logo" %>
+    <%= render "components/super-navigation-header/header-content", navigation_links: navigation_links %>
+  </div>
+</header>
diff --git a/app/views/components/super-navigation-header/navigation-links.yml b/app/views/components/super-navigation-header/navigation-links.yml
@@ -0,0 +1,67 @@
+---
+- label: Topics
+  href: /browse
+  description: Find information and services
+  link_sections:
+    - - label: Benefits
+        href: /browse/benefits
+      - label: Births, death, marriages and care
+        href: /browse/births-deaths-marriages
+      - label: Brexit
+        href: /brexit
+      - label: Business and self-employed
+        href: /browse/business
+      - label: Childcare and parenting
+        href: /browse/childcare-parenting
+      - label: Citizenship and living in the UK
+        href: /browse/citizenship
+      - label: Coronavirus (COVID‑19)
+        href: /coronavirus
+      - label: Crime, justice and the law
+        href: /browse/justice
+      - label: Disabled people
+        href: /browse/disabilities
+    - - label: Driving and transport
+        href: /browse/driving
+      - label: Education and learning
+        href: /browse/education
+      - label: Employing people
+        href: /browse/employing-people
+      - label: Environment and countryside
+        href: /browse/environment-countryside
+      - label: Housing and local services
+        href: /browse/housing-local-services
+      - label: Money and tax
+        href: /browse/tax
+      - label: Passports, travel and living abroad
+        href: /browse/abroad
+      - label: Visas and immigration
+        href: /browse/visas-immigration
+      - label: Working, jobs and pensions
+        href: /browse/working
+- label: Departments
+  href: /government/organisations
+- label: Government activity
+  href: /search/news-and-communications
+  description: Find out what the government is doing
+  link_sections: 
+    - - label: News
+        href: /search/news-and-communications
+        description: News stories, speeches, letters and notices
+      - label: Guidance and regulation
+        href: /search/guidance-and-regulation
+        description: Detailed guidance, regulations and rules
+      - label: Research and statistics
+        href: /search/research-and-statistics
+        description: Reports, analysis and official statistics
+    - - label: Policy papers and consultation
+        href: /search/policy-papers-and-consultations
+        description: Consultations and strategy
+      - label: Transparency
+        href: /search/transparency-and-freedom-of-information-releases
+        description: Government data, freedom of information releases and corporate reports
+  footer_links:
+    - - label: How government works
+        href: /government/how-government-works
+    - - label: Get involved
+        href: /government/get-involved
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -1,41 +1,49 @@
-<header role="banner" id="global-header" class="<%= yield(:header_class) %>">
-  <div class="header-wrapper">
-    <div class="header-global">
-      <div class="header-logo">
-        <a href="<%= content_for?(:homepage_url) ? yield(:homepage_url) : "https://www.gov.uk/" %>"
-            title="<%= content_for?(:logo_link_title) ? yield(:logo_link_title) : "Go to the GOV.UK homepage" %>"
-            class="content govuk-header__link govuk-header__link--homepage"
-            id="logo"
-            data-module="gem-track-click"
-            data-track-category="homeLinkClicked"
-            data-track-action="homeHeader">
-          <span class="govuk-header__logotype">
-            <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>
-              <image src="<%= asset_path 'gov.uk_logotype_crown_invert_trans.png' %>"
-                      xlink:href=""
-                      class="govuk-header__logotype-crown-fallback-image"
-                      width="36"
-                      height="32">
-              </image>
-            </svg>
-            <span class="govuk-header__logotype-text">
-              <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
+<%
+  show_super_navigation_header ||= false # will be shown or hidden by A/B Test variable
+%>
+
+<% if show_super_navigation_header %>
+  <%= render "components/super-navigation-header/super-navigation-header" %>
+<% else %>
+  <header role="banner" id="global-header" class="<%= yield(:header_class) %>">
+    <div class="header-wrapper">
+      <div class="header-global">
+        <div class="header-logo">
+          <a href="<%= content_for?(:homepage_url) ? yield(:homepage_url) : "https://www.gov.uk/" %>"
+              title="<%= content_for?(:logo_link_title) ? yield(:logo_link_title) : "Go to the GOV.UK homepage" %>"
+              class="content govuk-header__link govuk-header__link--homepage"
+              id="logo"
+              data-module="gem-track-click"
+              data-track-category="homeLinkClicked"
+              data-track-action="homeHeader">
+            <span class="govuk-header__logotype">
+              <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>
+                <image src="<%= asset_path 'gov.uk_logotype_crown_invert_trans.png' %>"
+                        xlink:href=""
+                        class="govuk-header__logotype-crown-fallback-image"
+                        width="36"
+                        height="32">
+                </image>
+              </svg>
+              <span class="govuk-header__logotype-text">
+                <%= content_for?(:global_header_text) ? yield(:global_header_text) : "GOV.UK" %>
+              </span>
             </span>
-          </span>
-        </a>
+          </a>
+        </div>
+        <%= yield :inside_header %>
       </div>
-      <%= yield :inside_header %>
+      <%= yield :proposition_header %>
     </div>
-    <%= yield :proposition_header %>
-  </div>
-</header>
+  </header>
+<% end %>