x-govuk · paulrobertlloyd · May 21, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20
+22
diff --git a/app/assets/application.scss b/app/assets/application.scss
@@ -0,0 +1,15 @@
+// Use GOV.UK Frontend components
+$_font-family: system-ui, sans-serif;
+@use "pkg:govuk-frontend/dist/govuk" with (
+  $govuk-global-styles: true,
+  $govuk-new-organisation-colours: true,
+  $govuk-new-typography-scale: true,
+  $govuk-font-family: $_font-family,
+  $govuk-brand-colour: #2288aa,
+  $govuk-link-colour: #006688,
+  $govuk-link-hover-colour: #004466,
+  $govuk-link-visited-colour: #333366
+);
+
+// Use GOV.UK Eleventy Plugin components
+@use "pkg:@x-govuk/govuk-eleventy-plugin";
diff --git a/app/includes/posts.njk b/app/includes/posts.njk
diff --git a/app/includes/shared_projects.njk b/app/includes/shared_projects.njk
@@ -1,4 +1,3 @@
-<h2 class="govuk-heading-l" id="projects">Projects</h2>
 <div class="govuk-grid-row">
 {% set columns = cycler("1", "2") %}
 {% for repo in repos | includes("topics", "project") | sort(false, true, "name") %}

diff --git a/app/index.md b/app/index.md
@@ -5,20 +5,12 @@ title: Welcome to X-GOVUK
 description: A community-maintained collection of resources which are useful for working on GOV.UK services.
 ---
 
-{% include "../app/includes/shared_projects.njk" %}
-
-{% include "../app/includes/posts.njk" %}
-
-<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--xl govuk-!-margin-top-0">
-
-<h2 class="govuk-heading-l" id="resources">Resources</h2>
-
 <div class="govuk-grid-row">
 <div class="govuk-grid-column-one-half-from-desktop govuk-!-margin-bottom-4">
 
-### Design
+## Design
 
-#### Design systems, patterns and components
+### Design systems, patterns and components
 
 - [GOV.UK Design System](https://design-system.service.gov.uk)
 - [Digital Land Design System](https://digital-land.github.io/design-system/)
@@ -41,38 +33,38 @@ description: A community-maintained collection of resources which are useful for
 - [Maidstone Design System](https://digitalservices.maidstone.gov.uk/about-us/design-system)
 - [Essex County Council's design and patterns library](https://www.essex.gov.uk/essex-county-councils-design-and-patterns-library)
 
-#### Other design resources
+### Content design
+
+- [Government Digital Service style guide](https://www.gov.uk/guidance/style-guide/a-to-z-of-gov-uk-style)
+- [Department for Education style guide](https://design.education.gov.uk/content-design/style-guide/)
+- [GOV.WALES style guide](https://gov.wales/govwales-style-guide)
+- [HMRC content style guide](https://design.tax.service.gov.uk/hmrc-content-style-guide/)
+- [Home Office style guide](https://design.homeoffice.gov.uk/content-style-guide)
+- [MoJ content style guide](https://design-patterns.service.justice.gov.uk/content-standards/style-guide/)
+- [NHS content style guide](https://service-manual.nhs.uk/content)
+
+### Other design resources
 
 - [Accessibility Personas](https://alphagov.github.io/accessibility-personas/)
 - [Department for Education Design Manual](https://design.education.gov.uk)
 - [Statistics on usage of `govuk-frontend` components](https://github.com/x-govuk/govuk-frontend-component-stats)
 
-### User research
+## User research
 
 - [Department for Education User Research manual](https://user-research.education.gov.uk)
 - [Local government user research library](https://research.localgov.digital/)
 
 </div>
 <div class="govuk-grid-column-one-half-from-desktop govuk-!-margin-bottom-4">
 
-### Content design
-
-- [Government Digital Service style guide](https://www.gov.uk/guidance/style-guide/a-to-z-of-gov-uk-style)
-- [Department for Education style guide](https://design.education.gov.uk/content-design/style-guide/)
-- [GOV.WALES style guide](https://gov.wales/govwales-style-guide)
-- [HMRC content style guide](https://design.tax.service.gov.uk/hmrc-content-style-guide/)
-- [Home Office style guide](https://design.homeoffice.gov.uk/content-style-guide)
-- [MoJ content style guide](https://design-patterns.service.justice.gov.uk/content-standards/style-guide/)
-- [NHS content style guide](https://service-manual.nhs.uk/content)
-
-### Prototyping
+## Prototyping
 
 - [GOV.UK Prototype Kit](https://prototype-kit.service.gov.uk/docs/)
 - [GOV.UK Prototype Wizard](https://github.com/x-govuk/govuk-prototype-wizard)
 - [Navigation radios extension](https://github.com/x-govuk/prototype-navigation-radios)
 - [GOV.UK Figma library](https://www.figma.com/file/NWuFffKvPQhl3aJ9nKU0p3/GOV.UK-Design-System?node-id=0%3A1)
 
-### Frontend
+## Frontend
 
 - [GOV.UK Frontend](https://frontend.design-system.service.gov.uk)
 - [GOV.UK Frontend Flask](https://github.com/LandRegistry/govuk-frontend-flask)
@@ -86,11 +78,11 @@ description: A community-maintained collection of resources which are useful for
 - [Twirl](https://github.com/hmrc/play-frontend-hmrc)
 - [WTForms](https://github.com/LandRegistry/govuk-frontend-wtf)
 
-### Analysis
+## Analysis
 
 - [Quarto templates](https://github.com/DataS-DHSC/dhsc_quarto_template)
 
-### Product management
+## Product management
 
 - [Product management learning list](https://docs.google.com/spreadsheets/d/15bimOfA5EYpvfC3UbU8MUV-qUjhSKdcrukHisQqNzhU/edit#gid=0)
 - [Learn by doing (for associate and mid-level product managers)](https://github.com/alphagov/Product-Managers-Learn-By-Doing)

diff --git a/app/posts/feed.njk b/app/posts/feed.njk
@@ -2,8 +2,7 @@
 eleventyExcludeFromCollections: true
 layout: feed
 permalink: /feed.xml
-pagination:
-  data: collections.post
-  size: 20
-  reverse: true
+collection:
+  name: post
+  limit: 20
 ---
diff --git a/app/posts/index.md b/app/posts/index.md
@@ -6,6 +6,4 @@ pagination:
   data: collections.post
   size: 20
   reverse: true
-eleventyNavigation:
-  parent: X-GOVUK
 ---
diff --git a/app/projects/index.md b/app/projects/index.md
@@ -0,0 +1,7 @@
+---
+layout: product
+title: Community projects
+description: Projects being developed across government teams
+---
+
+{% include "../../app/includes/shared_projects.njk" %}
diff --git a/app/sass/_settings.scss b/app/sass/_settings.scss
diff --git a/eleventy.config.js b/eleventy.config.js
@@ -1,25 +1,40 @@
-import rssPlugin from '@11ty/eleventy-plugin-rss'
-import govukEleventyPlugin from '@x-govuk/govuk-eleventy-plugin'
+import { govukEleventyPlugin } from '@x-govuk/govuk-eleventy-plugin'
 
-export default function (eleventyConfig) {
-  eleventyConfig.addPlugin(rssPlugin)
+const serviceName = 'X-GOVUK'
 
+export default function (eleventyConfig) {
   eleventyConfig.addPlugin(govukEleventyPlugin, {
     icons: {
-      mask: 'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-mask-icon.svg?raw=true',
+      mask: 'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-icon-mask.svg?raw=true',
       shortcut:
-        'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-favicon.ico',
+        'https://raw.githubusercontent.com/x-govuk/logo/main/images/favicon.ico',
       touch:
-        'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-apple-touch-icon.png'
+        'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-icon-180.png'
     },
     opengraphImageUrl:
       'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-opengraph-image.png',
-    feedUrl: 'feed.xml',
-    homeKey: 'X-GOVUK',
-    titleSuffix: 'X-GOVUK',
+    themeColor: '#2288aa',
+    titleSuffix: serviceName,
+    homeKey: serviceName,
+    showBreadcrumbs: false,
+    headingPermalinks: true,
     url: process.env.GITHUB_ACTIONS && 'https://x-govuk.github.io/',
-    header: {
-      logotype: 'x-govuk'
+    stylesheets: ['/assets/application.css'],
+    serviceNavigation: {
+      navigation: [
+        {
+          text: 'Home',
+          href: '/'
+        },
+        {
+          text: 'Community projects',
+          href: '/projects'
+        },
+        {
+          text: 'Posts',
+          href: '/posts'
+        }
+      ]
     },
     footer: {
       meta: {
@@ -36,7 +51,8 @@ export default function (eleventyConfig) {
       copyright: {
         text: '© X-GOVUK'
       }
-    }
+    },
+    rebrand: true
   })
 
   // Collections
@@ -47,14 +63,16 @@ export default function (eleventyConfig) {
   // Pass through
   eleventyConfig.addPassthroughCopy('./app/assets')
 
+  // Enable X-GOVUK brand
+  eleventyConfig.addNunjucksGlobal('xGovuk', true)
+
   return {
     dataTemplateEngine: 'njk',
     htmlTemplateEngine: 'njk',
     markdownTemplateEngine: 'njk',
     dir: {
       input: 'app',
-      data: 'data',
-      layouts: '../node_modules/@x-govuk/govuk-eleventy-plugin/layouts'
+      data: 'data'
     }
   }
 }