diff --git a/.eleventy.js b/.eleventy.js index 75ce361e..aa3c73cb 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -7,8 +7,7 @@ module.exports = function(eleventyConfig) { eleventyConfig.addPassthroughCopy({ "docs/assets/logos": "assets/logos"}); // Register the plugins let govukPluginOptions = { - brandColour: '#8f23b3', - fontFamily: 'roboto, system-ui, sans-serif', + scssSettingsPath: "/styles/_settings.scss", icons: { mask: '/assets/logos/ho-mask-icon.svg', shortcut: '/assets/logos/ho-favicon.ico', @@ -17,8 +16,13 @@ module.exports = function(eleventyConfig) { opengraphImageUrl: '/assets/logos/ho-opengraph-image.png', homeKey: 'Home', header: { - organisationLogo: 'Home Office Logo', - organisationName: 'Home Office', + logotype: { + html: + '' + + ' Home Office Logo' + + ' Home Office' + + '' + }, productName: 'Engineering Guidance and Standards', search: { label: 'Search site', diff --git a/_includes/layouts/collection.njk b/_includes/layouts/collection.njk index 332204e4..66b80b1a 100644 --- a/_includes/layouts/collection.njk +++ b/_includes/layouts/collection.njk @@ -1,4 +1,11 @@ {% extends "layouts/base.njk" %} +{#- +https://github.com/x-govuk/govuk-eleventy-plugin/blob/main/components/header/template.njk#L4-L6 + +The govuk header uses the layout name to remove the border for collection and product pages. Because we add the phase +banner, the border should be on all pages, so hide that this is a collection page. +-#} +{%- set layout="prevent-layout-specific-styling" -%} {% block main %} {% if phaseBannerConfiguration %} diff --git a/_includes/layouts/product.njk b/_includes/layouts/product.njk index 4c6fd9fb..ce9d1c98 100644 --- a/_includes/layouts/product.njk +++ b/_includes/layouts/product.njk @@ -1,5 +1,13 @@ {% extends "layouts/base.njk" %} -{# Forked from layouts/product to wrap masthead in region #} +{#- Forked from layouts/product to wrap masthead in region -#} + +{#- +https://github.com/x-govuk/govuk-eleventy-plugin/blob/main/components/header/template.njk#L4-L6 + +The govuk header uses the layout name to remove the border for collection and product pages. Because we add the phase +banner, the border should be on all pages, so hide that this is a product page. +-#} +{%- set layout="prevent-layout-specific-styling" -%} {% block main %} {% if phaseBannerConfiguration %} @@ -19,15 +27,15 @@ html: description | markdown("inline") | noOrphans } if description, startButton: { - href: startButton.href | url, + href: startButton.href, text: startButton.text } if startButton, image: { alt: image.alt, - src: image.src | url + src: image.src } if image, breadcrumbs: { - classes: "govuk-!-display-none-print govuk-!-margin-bottom-0", + classes: "govuk-!-display-none-print", items: breadcrumbItems } if showBreadcrumbs }) }} diff --git a/_includes/layouts/search-index.njk b/_includes/layouts/search-index.njk index 58138012..7e14324b 100644 --- a/_includes/layouts/search-index.njk +++ b/_includes/layouts/search-index.njk @@ -7,6 +7,6 @@ "hasFrontmatterDate": {{ item.data.date !== undefined }}, "date": {{ item.date | date("d LLLL y") | dump | safe }}, "templateContent": {{ item.templateContent | tokenize | dump | safe }}, - "url": {{ item.url | url | pretty | dump | safe }} + "url": {{ item.url | pretty | dump | safe }} }{% if not loop.last %},{% endif %} {% endfor %}] diff --git a/_includes/layouts/tags.njk b/_includes/layouts/tags.njk index 5d7a0689..24ed3431 100644 --- a/_includes/layouts/tags.njk +++ b/_includes/layouts/tags.njk @@ -22,7 +22,7 @@