Skip to content

Commit 3da23f6

Browse files
alexcolbeck1alexcolbeck1
authored
Upgrade nhsukfrontend (now with signed commits) (#136)
* Upgrading nhsuk-frontend to latest version and moving SASS files to assets/css/ * Hiding the new 'account' link
1 parent 391b226 commit 3da23f6

26 files changed

+207
-486
lines changed

‎docs/_config.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,11 @@ callouts:
7070
color: red
7171

7272
sass:
73-
style: compact # possible values: nested expanded compact compressed
73+
sass_dir: assets/css
7474
load_paths:
75-
- _sass/
76-
- node_modules/nhsuk-frontend/packages/
75+
- node_modules
76+
- node_modules/nhsuk-frontend/dist
77+
style: compressed
7778

7879
# Exclude from processing.
7980
# The following items will not be processed, by default.

‎docs/_includes/breadcrumb.html‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@
55
<ol class="nhsuk-breadcrumb__list">
66

77
<!-- Level 1 -->
8-
<li class="nhsuk-breadcrumb__item">
8+
<li class="nhsuk-breadcrumb__list-item">
99
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/">Home</a>
1010
</li>
1111

1212
<!-- Level 2 -->
1313
{% if page.parent == "Features" %}
14-
<li class="nhsuk-breadcrumb__item">
14+
<li class="nhsuk-breadcrumb__list-item">
1515
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/features">Features</a>
1616
</li>
1717
{% endif %}
1818

1919
{% if page.parent == "Pricing" %}
20-
<li class="nhsuk-breadcrumb__item">
20+
<li class="nhsuk-breadcrumb__list-item">
2121
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/pricing">Pricing</a>
2222
</li>
2323
{% endif %}
2424

2525
{% if page.parent == "Using NHS Notify" %}
26-
<li class="nhsuk-breadcrumb__item">
26+
<li class="nhsuk-breadcrumb__list-item">
2727
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/using-nhs-notify">Using NHS Notify</a>
2828
</li>
2929
{% endif %}
3030

3131
{% if page.parent == "Support" %}
32-
<li class="nhsuk-breadcrumb__item">
32+
<li class="nhsuk-breadcrumb__list-item">
3333
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/support">Support</a>
3434
</li>
3535
{% endif %}
3636

3737
{% if page.parent == "Get started" %}
38-
<li class="nhsuk-breadcrumb__item">
38+
<li class="nhsuk-breadcrumb__list-item">
3939
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/get-started">Get started</a>
4040
</li>
4141
{% endif %}
@@ -44,76 +44,72 @@
4444

4545
<!-- Mobile breadcrumb back -->
4646

47-
<p class="nhsuk-breadcrumb__back">
48-
4947
<!-- Features -->
5048
{% if page.title == "Features" %}
51-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/">
49+
<a class="nhsuk-back-link" href="{{site.baseurl}}/">
5250
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
5351
Home
5452
</a>
5553
{% endif %}
5654

5755
{% if page.parent == "Features" %}
58-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/features">
56+
<a class="nhsuk-back-link" href="{{site.baseurl}}/features">
5957
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
6058
Features
6159
</a>
6260
{% endif %}
6361

6462
<!-- Pricing -->
6563
{% if page.title == "Pricing" %}
66-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/">
64+
<a class="nhsuk-back-link" href="{{site.baseurl}}/">
6765
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
6866
Home
6967
</a>
7068
{% endif %}
7169

7270
{% if page.parent == "Pricing" %}
73-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/pricing">
71+
<a class="nhsuk-back-link" href="{{site.baseurl}}/pricing">
7472
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
7573
Pricing
7674
</a>
7775
{% endif %}
7876

7977
<!-- Using NHS Notify -->
8078
{% if page.title == "Using NHS Notify" %}
81-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/">
79+
<a class="nhsuk-back-link" href="{{site.baseurl}}/">
8280
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
8381
Home
8482
</a>
8583
{% endif %}
8684

8785
{% if page.parent == "Using NHS Notify" %}
88-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/using-nhs-notify">
86+
<a class="nhsuk-back-link" href="{{site.baseurl}}/using-nhs-notify">
8987
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
9088
Using NHS Notify
9189
</a>
9290
{% endif %}
9391

9492
<!-- Support -->
9593
{% if page.title == "Support" %}
96-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/">
94+
<a class="nhsuk-back-link" href="{{site.baseurl}}/">
9795
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
9896
Home
9997
</a>
10098
{% endif %}
10199

102100
<!-- Get started -->
103101
{% if page.title == "Get started" %}
104-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/">
102+
<a class="nhsuk-back-link" href="{{site.baseurl}}/">
105103
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
106104
Home
107105
</a>
108106
{% endif %}
109107

110108
{% if page.parent == "Get started" %}
111-
<a class="nhsuk-breadcrumb__backlink" href="{{site.baseurl}}/get-started">
109+
<a class="nhsuk-back-link" href="{{site.baseurl}}/get-started">
112110
<span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>
113111
Get started
114112
</a>
115113
{% endif %}
116114

117-
</p>
118-
119115
</nav>

‎docs/_includes/components/action-link.html‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
<div class="nhsuk-action-link">
2-
<a class="nhsuk-action-link__link" href="{{ include.url | uri_escape }}">
3-
<svg class="nhsuk-icon nhsuk-icon__arrow-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
4-
aria-hidden="true" width="36" height="36">
5-
<path d="M0 0h24v24H0z" fill="none"></path>
6-
<path
7-
d="M12 2a10 10 0 0 0-9.95 9h11.64L9.74 7.05a1 1 0 0 1 1.41-1.41l5.66 5.65a1 1 0 0 1 0 1.42l-5.66 5.65a1 1 0 0 1-1.41 0 1 1 0 0 1 0-1.41L13.69 13H2.05A10 10 0 1 0 12 2z">
8-
</path>
9-
</svg>
10-
<span class="nhsuk-action-link__text">{{ include.text }}</span>
11-
</a>
12-
</div>
1+
<a class="nhsuk-action-link" href="{{ include.url | uri_escape }}"><svg
2+
class="nhsuk-icon nhsuk-icon--arrow-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16"
3+
height="16" focusable="false" aria-hidden="true">
4+
<path
5+
d="M12 2a10 10 0 0 0-10 9h11.7l-4-4a1 1 0 0 1 1.5-1.4l5.6 5.7a1 1 0 0 1 0 1.4l-5.6 5.7a1 1 0 0 1-1.5 0 1 1 0 0 1 0-1.4l4-4H2A10 10 0 1 0 12 2z" />
6+
</svg><span class="nhsuk-action-link__text">{{ include.text }}</span></a>

‎docs/_includes/components/button-reverse.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<a href="{{ include.url }}" target="_blank">
2-
<button class="nhsuk-button nhsuk-button--reverse">
3-
{{ include.text }}
4-
</button>
1+
<a href="{{ include.url }}" target="{{ include.target }}" class="nhsuk-button nhsuk-button--reverse">
2+
{{ include.text }}
53
</a>

‎docs/_includes/components/button.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<a href="{{ include.url }}" target="_blank">
2-
<button class="nhsuk-button">
3-
{{ include.text }}
4-
</button>
1+
<a href="{{ include.url }}" target="{{ include.target }}" class="nhsuk-button">
2+
{{ include.text }}
53
</a>

‎docs/_includes/components/inset-text.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="nhsuk-inset-text-override">
1+
<div class="nhsuk-inset-text">
22
<span class="nhsuk-u-visually-hidden">Information:</span>
33
{{ include.text | markdownify }}
44
</div>

‎docs/_includes/components/phase-banner.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
<div class="nhsuk-phase-banner" id="{{include.phase_id}}">
22
<div class="nhsuk-width-container">
3-
<p class="nhsuk-phase-banner__content">
3+
4+
<div class="nhsuk-phase-banner__content">
5+
46
<strong class="nhsuk-tag">NEWS</strong>
7+
58
<span class="nhsuk-phase-banner__text">NHS announces move to digital-first messaging.
6-
<a class="nhsuk-link" href="https://notify.nhs.uk/using-nhs-notify/nhs-digital-first-strategy">Send messages with the NHS App first using NHS
9+
<a class="nhsuk-link" href="https://notify.nhs.uk/using-nhs-notify/nhs-digital-first-strategy">Send messages
10+
with the NHS App first using NHS
711
Notify</a>.
812
</span>
9-
</p>
13+
14+
</div>
15+
1016
</div>
1117
</div>
1218
<script>

0 commit comments

Comments
 (0)