Merge branch 'main' into style-guide

nhsuk · Nov 5, 2024 · 1e8a490 · 1e8a490
2 parents 6c8318d + 8724526
commit 1e8a490
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,8 @@ We normally use the [NHS content guide](https://service-manual.nhs.uk/content) f
 
 ### command line
 
-Lower case. Only use for Windows instructions. Nortmally it will be ‘the command line’.
+Lower case. Only use for Windows instructions. Normally it will be ‘the command line’.
+
 
 #### GOV.UK Prototype Kit, GOV.UK Design System and other GOV.UK products
 

diff --git a/app/assets/images/nhs-prototype-kit-opengraph.png b/app/assets/images/nhs-prototype-kit-opengraph.png
diff --git a/app/locals.js b/app/locals.js
@@ -1,5 +1,6 @@
 module.exports = (config) => (req, res, next) => {
   res.locals.serviceName = config.serviceName;
+  res.locals.url = process.env.URL;
 
   next();
 };
diff --git a/app/views/layout.html b/app/views/layout.html
@@ -7,10 +7,6 @@
   <link href="/css/docs.css" rel="stylesheet">
 {% endblock %}
 
-{% block pageTitle %}
-  NHS.UK prototype kit docs
-{% endblock %}
-
 {% block header %}
   {{ header({
     homeHref: "/",

diff --git a/app/views/template.html b/app/views/template.html
@@ -68,6 +68,8 @@
     <meta name="msapplication-square150x150logo" content="/nhsuk-frontend/assets/favicons/mediumtile-150x150.png">
     <meta name="msapplication-wide310x150logo" content="/nhsuk-frontend/assets/favicons/widetile-310x150.png">
     <meta name="msapplication-square310x310logo" content="/nhsuk-frontend/assets/favicons/largetile-310x310.png">
+    <meta property="og:image" content="{{ url }}/images/nhs-prototype-kit-opengraph.png">
+    <meta name="twitter:card" content="summary_large_image"><meta name="twitter:image" content="{{ url }}/images/nhs-prototype-kit-opengraph.png">
     {% endblock %}
 
     {% block head %}{% endblock %}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,10 +35,10 @@
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
     "lodash": "^4.17.21",
-    "nhsuk-frontend": "^9.0.1",
+    "nhsuk-frontend": "^9.1.0",
     "nunjucks": "^3.2.4",
     "path": "^0.12.7",
-    "sass": "^1.80.5"
+    "sass": "^1.80.6"
   },
   "devDependencies": {
     "eslint": "^8.56.0",