Skip to content

Commit 0728aff

Browse files
committed
feat(v9.0.0)!: Update to support govuk-frontend v6.0.0 (#2192)
Updates to the design system site to support GOV.UK Frontend v6.0.0 BREAKING CHANGE: Updates to MOJ Frontend to support all the changes in GOV.UK Frontend v6.0.0
1 parent b687348 commit 0728aff

File tree

41 files changed

+184
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+184
-141
lines changed

.github/workflows/sass.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ jobs:
1616

1717
matrix:
1818
package-version:
19-
# Release without major deprecations
20-
- 1.77.6
21-
22-
# Release with `mixed-decls` deprecated
23-
- 1.77.7
19+
# Earliest release supported by GOV.UK frontend v6.0.0
20+
- 1.79.0
2421

2522
# Release with `import` deprecated
2623
- 1.80.0

app/views/common/404.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% block header %}
33
{% include "./partials/header-no-nav.njk" %}
44
{% endblock %}
5-
{% block main %}
5+
{% block container %}
66
<div class="app-layout__content">
77
<main id="main-content" class="app-prose-scope">
88
<h1>{{ title }}</h1>

app/views/common/500.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% block header %}
33
{% include "./partials/header-no-nav.njk" %}
44
{% endblock %}
5-
{% block main %}
5+
{% block container %}
66
<div class="app-layout__content">
77
<main id="main-content" class="app-prose-scope">
88
<h1>{{ title }}</h1>

app/views/common/base.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{% include "./partials/header.njk" %}
4343
{% endblock %}
4444

45-
{% block main %}
45+
{% block container %}
4646
<div class="app-layout">
4747
<div id="sidebar" class="app-layout__sidebar">
4848
{% include "./partials/side-navigation.njk" ignore missing %}

app/views/common/partials/side-navigation.njk

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@
4545

4646

4747

48+
<li class="app-vertical-nav__item ">
49+
<a class="app-vertical-nav__link" href="/components/api-error/">API error</a></li>
50+
51+
52+
53+
54+
4855
<li class="app-vertical-nav__item ">
4956
<a class="app-vertical-nav__link" href="/components/badge/">Badge</a></li>
5057

@@ -192,6 +199,13 @@
192199

193200

194201

202+
<li class="app-vertical-nav__item ">
203+
<a class="app-vertical-nav__link" href="/components/outage-banner/">Outage banner</a></li>
204+
205+
206+
207+
208+
195209
<li class="app-vertical-nav__item ">
196210
<a class="app-vertical-nav__link" href="/components/page-header-actions/">Page header actions</a></li>
197211

docs/_includes/layouts/404.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% block header %}
33
{% include "./partials/header-no-nav.njk" %}
44
{% endblock %}
5-
{% block main %}
5+
{% block container %}
66
<div class="app-layout__content">
77
<main id="main-content" class="app-prose-scope">
88
<h1>{{ title }}</h1>

docs/_includes/layouts/500.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{% block header %}
33
{% include "./partials/header-no-nav.njk" %}
44
{% endblock %}
5-
{% block main %}
5+
{% block container %}
66
<div class="app-layout__content">
77
<main id="main-content" class="app-prose-scope">
88
<h1>{{ title }}</h1>

docs/_includes/layouts/base.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{% include "./partials/header.njk" %}
4343
{% endblock %}
4444

45-
{% block main %}
45+
{% block container %}
4646
<div class="app-layout">
4747
<div id="sidebar" class="app-layout__sidebar">
4848
{% include "./partials/side-navigation.njk" ignore missing %}

docs/_includes/layouts/example.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<style>{% include stylesPath ignore missing %}</style>
2121
{% endblock %}
2222

23-
{% block main %}
23+
{% block container %}
2424
{{ content | safe }}
2525
{% endblock %}
2626

docs/stylesheets/components/_header.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.moj-header--docs {
44
padding-top: govuk-spacing(3);
5-
border-bottom: 10px solid govuk-colour("pink");
5+
border-bottom: 10px solid govuk-colour("magenta", $variant: "primary");
66
background-color: #220051;
77
}
88

@@ -28,13 +28,15 @@
2828

2929
&--organisation-name {
3030
display: none;
31+
3132
@include govuk-media-query($from: tablet) {
3233
display: initial;
3334
}
3435
}
3536

3637
&--organisation-initials {
3738
font-weight: bold;
39+
3840
@include govuk-media-query($from: tablet) {
3941
display: none;
4042
}

0 commit comments

Comments
 (0)