Skip to content

Commit 83cea64

Browse files
authored
Merge branch 'main' into Proofing-content
2 parents 8f93336 + 3b43464 commit 83cea64

File tree

5 files changed

+68
-4
lines changed

5 files changed

+68
-4
lines changed

docs/Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ gem "minima", "~> 2.5"
1515
# gem "github-pages", group: :jekyll_plugins
1616
# If you have any plugins, put them here!
1717
group :jekyll_plugins do
18+
gem 'jekyll-content-security-policy-generator'
1819
gem "jekyll-feed", "~> 0.12"
1920
gem "jekyll-drawio"
2021
end

docs/Gemfile.lock

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ GEM
66
cgi (0.4.1)
77
colorator (1.1.0)
88
concurrent-ruby (1.2.3)
9+
digest (3.2.0)
910
em-websocket (0.5.3)
1011
eventmachine (>= 0.12.9)
1112
http_parser.rb (~> 0)
@@ -35,6 +36,10 @@ GEM
3536
safe_yaml (~> 1.0)
3637
terminal-table (>= 1.8, < 4.0)
3738
webrick (~> 1.7)
39+
jekyll-content-security-policy-generator (1.6.15)
40+
digest
41+
jekyll
42+
nokogiri
3843
jekyll-drawio (1.1.1)
3944
erb (>= 2.2, < 5.0)
4045
jekyll (~> 4.3)
@@ -95,11 +100,10 @@ GEM
95100
rbs (>= 3, < 4)
96101
sorbet-runtime (>= 0.5.10782)
97102
safe_yaml (1.0.5)
98-
sass-embedded (1.69.5)
99-
google-protobuf (~> 3.23)
100-
rake (>= 13.0.0)
101103
sass-embedded (1.69.5-arm64-darwin)
102104
google-protobuf (~> 3.23)
105+
sass-embedded (1.69.5-x86_64-linux-gnu)
106+
google-protobuf (~> 3.23)
103107
sorbet-runtime (0.5.11466)
104108
strscan (3.1.0)
105109
terminal-table (3.0.2)
@@ -114,6 +118,7 @@ PLATFORMS
114118
DEPENDENCIES
115119
http_parser.rb (~> 0.6.0)
116120
jekyll (~> 4.3.3)
121+
jekyll-content-security-policy-generator
117122
jekyll-drawio
118123
jekyll-feed (~> 0.12)
119124
jekyll-sitemap (~> 1.4)

docs/_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ collections:
3434

3535
# Build settings
3636
plugins:
37+
- jekyll-content-security-policy-generator
3738
- jekyll-feed
3839
- jekyll-sitemap
3940

docs/_includes/breadcrumb.html

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,68 @@
44

55
<ol class="nhsuk-breadcrumb__list">
66
<!-- Level 1 -->
7-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/">Home</a></li>
7+
<li class="nhsuk-breadcrumb__item">
8+
<a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/">Home</a>
9+
10+
</li>
11+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
12+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
13+
<path
14+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
15+
</path>
16+
</svg>
817
<!-- Level 2 -->
918
{% if page.parent == "Features" %}
1019
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/features">Features</a>
1120
</li>
21+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
22+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
23+
<path
24+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
25+
</path>
26+
</svg>
1227
{% endif %}
1328
{% if page.parent == "Pricing" %}
1429
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/pricing">Pricing</a>
1530
</li>
31+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
32+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
33+
<path
34+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
35+
</path>
36+
</svg>
1637
{% endif %}
1738
{% if page.parent == "Using NHS Notify" %}
1839
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/using-nhs-notify">Using
1940
NHS Notify</a>
2041
</li>
42+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
43+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
44+
<path
45+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
46+
</path>
47+
</svg>
2148
{% endif %}
2249
{% if page.parent == "Support" %}
2350
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/support">Support</a>
2451
</li>
52+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
53+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
54+
<path
55+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
56+
</path>
57+
</svg>
2558
{% endif %}
2659
{% if page.parent == "Get started" %}
2760
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" href="{{site.baseurl}}/get-started">Get
2861
started</a>
2962
</li>
63+
<svg class='nhsuk-icon nhsnotify-breadcrumb-chevron' xmlns='http://www.w3.org/2000/svg' fill='#aeb7bd' height='18'
64+
width='18' viewBox='0 0 24 24' aria-hidden='true'>
65+
<path
66+
d='M15.5 12a1 1 0 0 1-.29.71l-5 5a1 1 0 0 1-1.42-1.42l4.3-4.29-4.3-4.29a1 1 0 0 1 1.42-1.42l5 5a1 1 0 0 1 .29.71z'>
67+
</path>
68+
</svg>
3069
{% endif %}
3170
</ol>
3271

docs/_sass/_nhsnotify.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,21 @@
172172
}
173173

174174
}
175+
176+
.nhsuk-breadcrumb__item:not(:last-child):after {
177+
display: none;
178+
height: 0px;
179+
margin-left: 0px;
180+
margin-right: 0px;
181+
width: 0px;
182+
}
183+
184+
.nhsnotify-breadcrumb-chevron {
185+
width: 18px;
186+
height: 18px;
187+
margin-bottom: -4px;
188+
}
189+
190+
.nhsnotify-breadcrumb-chevron:last-child {
191+
display: none;
192+
}

0 commit comments

Comments
 (0)