Skip to content

Commit 5e2a262

Browse files
Merge main
2 parents e137b1c + fa5eabb commit 5e2a262

File tree

215 files changed

+4352
-6068
lines changed

Some content is hidden

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

215 files changed

+4352
-6068
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
- name: Setup Pages
2929
uses: actions/configure-pages@v5
3030
- name: Install dependencies
3131
run: npm ci
3232
- name: Build with Eleventy
3333
run: npm run-script build
3434
- name: Upload artifact
35-
uses: actions/upload-pages-artifact@v3
35+
uses: actions/upload-pages-artifact@v4
3636

3737
deploy:
3838
environment:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ node_modules
33
_site
44
.DS_Store
55
.nova
6+
.tool-versions

.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/_components/_all.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/_components/_index.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@forward "email";
2+
@forward "screenshots";

app/_components/email/_email.scss

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/_components/email/_index.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@use "pkg:nhsuk-frontend/dist/nhsuk" as *;
2+
3+
.app-email {
4+
border: $nhsuk-border-width solid $nhsuk-border-colour;
5+
padding: nhsuk-spacing(4);
6+
margin-bottom: nhsuk-spacing(8);
7+
max-width: 40rem;
8+
9+
h1, h2, h3, h4 {
10+
@include nhsuk-font-size($size: 26);
11+
@include nhsuk-typography-weight-bold;
12+
margin-bottom: nhsuk-spacing(4);
13+
}
14+
}
15+
16+
.app-email__subject {
17+
padding-bottom: nhsuk-spacing(4);
18+
margin-top: 0;
19+
margin-bottom: nhsuk-spacing(4);
20+
border-bottom: 1px solid $nhsuk-border-colour;
21+
}

app/_components/header/_header.scss

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@use "pkg:nhsuk-frontend/dist/nhsuk" as *;
2+
3+
.app-image--screenshot {
4+
margin-top: 0;
5+
margin-bottom: nhsuk-spacing(9);
6+
7+
.nhsuk-image__img {
8+
padding: nhsuk-spacing(2);
9+
}
10+
11+
.nhsuk-image__caption > * {
12+
margin-bottom: nhsuk-spacing(3);
13+
14+
@include nhsuk-font(16);
15+
16+
&:last-child {
17+
margin-bottom: 0;
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)