Merge pull request #1733 from companieshouse/ROECCT-647-update-govuk-branding

ROECCT-647 Update GOV UK branding

Author: amalviyach

package-lock.json

@@ -36,7 +36,7 @@
     "cookie-parser": "^1.4.6",
     "express": "^4.17.3",
     "express-validator": "^6.14.0",
-    "govuk-frontend": "^4.6.0",
+    "govuk-frontend": "^4.10.1",
     "helmet": "^7.1.0",
     "ioredis": "^4.28.5",
     "luxon": "^2.4.0",

package.json

@@ -66,6 +66,7 @@ nunjucksEnv.addGlobal("PIWIK_REMOVE_START_GOAL_ID", config.PIWIK_REMOVE_START_GO
 nunjucksEnv.addGlobal("PIWIK_RELEVANT_PERIOD_START_GOAL_ID", config.PIWIK_RELEVANT_PERIOD_START_GOAL_ID);
 nunjucksEnv.addGlobal("PIWIK_CHS_DOMAIN", config.PIWIK_CHS_DOMAIN);
 nunjucksEnv.addGlobal("MATOMO_ASSET_PATH", `//${config.CDN_HOST}`);
+nunjucksEnv.addGlobal("govukRebrand", true);
 
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));

src/app.ts

@@ -24,13 +24,13 @@
 {% block head %}
 
   <!--[if !IE 8]><!-->
-  <link rel="stylesheet" type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/govuk-frontend/v4.6.0/govuk-frontend-4.6.0.min.css"/>
+  <link rel="stylesheet" type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/govuk-frontend/v4.10.1/govuk-frontend-4.10.1.min.css"/>
   <link rel="stylesheet" type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/services/overseas-entities/application.css" />
   {% include "includes/styles.html" %}
   <!--<![endif]-->
 
-  <link rel="SHORTCUT ICON" href="{{CDN_HOST}}/images/favicon.ico" />
-  <link rel="icon" href="{{CDN_HOST}}/images/favicon.ico" type="image/x-icon" />
+  <link rel="SHORTCUT ICON" href="{{CDN_HOST}}/images/govuk-frontend/v4.10.1/rebrand/favicon.ico" />
+  <link rel="icon" href="{{CDN_HOST}}/images/govuk-frontend/v4.10.1/rebrand/favicon.ico" type="image/x-icon" />
 
   <script src="https://code.jquery.com/jquery-3.6.0.js"
           integrity="sha256-H+K7U5CnXl1h5ywQfKtSj8PCmoN9aaq30gDh27Xc0jk="
@@ -92,7 +92,7 @@
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{CDN_HOST}}/javascripts/govuk-frontend/v4.6.0/govuk-frontend-4.6.0.min.js"></script>
+  <script src="{{CDN_HOST}}/javascripts/govuk-frontend/v4.10.1/govuk-frontend-4.10.1.min.js"></script>
   <script nonce={{ cspNonce | dump | safe }}>window.GOVUKFrontend.initAll()</script>
   {% include "includes/piwik-scripts.html" %}
 {% endblock %}

views/layout.html

@@ -24,13 +24,13 @@
 {% block head %}
 
   <!--[if !IE 8]><!-->
-  <link type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/govuk-frontend/v4.6.0/govuk-frontend-4.6.0.min.css" rel="stylesheet"/>
+  <link type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/govuk-frontend/v4.10.1/govuk-frontend-4.10.1.min.css" rel="stylesheet"/>
   <link type="text/css" media="all" href="{{CDN_HOST}}/stylesheets/services/overseas-entities/application.css" rel="stylesheet"/>
   {% include "includes/styles.html" %}
   <!--<![endif]-->
 
-  <link href="{{CDN_HOST}}/images/favicon.ico" rel="SHORTCUT ICON"/>
-  <link href="{{CDN_HOST}}/images/favicon.ico" type="image/x-icon" rel="icon"/>
+  <link href="{{CDN_HOST}}/images/govuk-frontend/v4.10.1/rebrand/favicon.ico" rel="SHORTCUT ICON"/>
+  <link href="{{CDN_HOST}}/images/govuk-frontend/v4.10.1/rebrand/favicon.ico" type="image/x-icon" rel="icon"/>
 
   <script src="https://code.jquery.com/jquery-3.6.0.js"
           integrity="sha256-H+K7U5CnXl1h5ywQfKtSj8PCmoN9aaq30gDh27Xc0jk="
@@ -100,7 +100,7 @@
 {% endblock %}
 
 {% block bodyEnd %}
-  <script src="{{ CDN_HOST }}/javascripts/govuk-frontend/v4.6.0/govuk-frontend-4.6.0.min.js" ></script>
+  <script src="{{ CDN_HOST }}/javascripts/govuk-frontend/v4.10.1/govuk-frontend-4.10.1.min.js" ></script>
   <script nonce={{cspNonce | dump | safe}} >window.GOVUKFrontend.initAll()</script>
   {% include "includes/piwik-scripts.html" %}
 {% endblock %}