diff --git a/docs/_components/example/template.njk b/docs/_components/example/template.njk index c5c4e13..7881e64 100644 --- a/docs/_components/example/template.njk +++ b/docs/_components/example/template.njk @@ -24,9 +24,9 @@
- +

- Open this example in a new tab + Open this example in a new tab

diff --git a/docs/_layouts/example-full-width.njk b/docs/_layouts/example-full-width.njk index eabdc4b..06b10c4 100644 --- a/docs/_layouts/example-full-width.njk +++ b/docs/_layouts/example-full-width.njk @@ -15,8 +15,8 @@ {% endblock %} {% block scripts %} - - + + diff --git a/docs/_layouts/example.njk b/docs/_layouts/example.njk index e0ffd39..db1ed90 100644 --- a/docs/_layouts/example.njk +++ b/docs/_layouts/example.njk @@ -17,8 +17,8 @@ {% endblock %} {% block scripts %} - - + + diff --git a/docs/_layouts/sub-navigation.njk b/docs/_layouts/sub-navigation.njk index 12ff04c..c693411 100644 --- a/docs/_layouts/sub-navigation.njk +++ b/docs/_layouts/sub-navigation.njk @@ -1,7 +1,7 @@ {% extends "layouts/sub-navigation.njk" %} {% block scripts %} - + diff --git a/docs/assets/sass/settings.scss b/docs/assets/sass/settings.scss new file mode 100644 index 0000000..9729adc --- /dev/null +++ b/docs/assets/sass/settings.scss @@ -0,0 +1,2 @@ +$govuk-brand-colour: #2288aa; +$govuk-font-family: system-ui, sans-serif; diff --git a/docs/data-attributes.md b/docs/data-attributes.md index 20e09e3..6931ce0 100644 --- a/docs/data-attributes.md +++ b/docs/data-attributes.md @@ -7,6 +7,6 @@ description: Use data attributes to help guide users during user research. {% for page in collections["data-attributes"] %} -- [{{ page.data.title }}]({{ page.url | url }}) – {{ page.data.description }} +- [{{ page.data.title }}]({{ page.url }}) – {{ page.data.description }} {% endfor %} diff --git a/docs/index.md b/docs/index.md index 0decaaa..9a5f5e7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,7 +15,7 @@ startButton: {% for item in collections.homepage %}

- {{ item.data.title | smart }} + {{ item.data.title | smart }}

{{ item.data.description | markdown("inline") }}

diff --git a/eleventy.config.js b/eleventy.config.js index 233c238..42860eb 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -15,8 +15,6 @@ const getComponentContent = (componentName) => { module.exports = function (eleventyConfig) { // Plugins eleventyConfig.addPlugin(govukEleventyPlugin, { - brandColour: '#28a', - fontFamily: 'system-ui, sans-serif', icons: { mask: 'https://raw.githubusercontent.com/x-govuk/logo/main/images/x-govuk-mask-icon.svg?raw=true', shortcut: @@ -31,13 +29,12 @@ module.exports = function (eleventyConfig) { url: 'https://x-govuk.github.io/#projects', name: 'X-GOVUK projects' }, - url: process.env.GITHUB_ACTIONS - ? 'https://x-govuk.github.io/govuk-prototype-components/' - : '/', + url: + process.env.GITHUB_ACTIONS && + 'https://x-govuk.github.io/govuk-prototype-components/', stylesheets: ['/styles/application.css'], header: { - organisationLogo: 'x-govuk', - organisationName: 'X-GOVUK', + logotype: 'x-govuk', productName: 'Prototype Components', search: { indexPath: '/search.json', @@ -135,6 +132,6 @@ module.exports = function (eleventyConfig) { layouts: '_layouts', includes: '_components' }, - pathPrefix: process.env.GITHUB_ACTIONS ? '/govuk-prototype-components' : '/' + pathPrefix: process.env.GITHUB_ACTIONS && '/govuk-prototype-components' } } diff --git a/package-lock.json b/package-lock.json index 420daae..8722de0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@11ty/eleventy": "^2.0.1", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.1", - "@x-govuk/govuk-eleventy-plugin": "^5.0.3", + "@x-govuk/govuk-eleventy-plugin": "x-govuk/govuk-eleventy-plugin", "@x-govuk/govuk-prototype-components": "file:./", "eslint": "^8.55.0", "eslint-config-prettier": "^9.1.0", diff --git a/package.json b/package.json index 805dccc..c77eb80 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@11ty/eleventy": "^2.0.1", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-node-resolve": "^15.0.1", - "@x-govuk/govuk-eleventy-plugin": "^5.0.3", + "@x-govuk/govuk-eleventy-plugin": "x-govuk/govuk-eleventy-plugin", "@x-govuk/govuk-prototype-components": "file:./", "eslint": "^8.55.0", "eslint-config-prettier": "^9.1.0",