Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CIV-12657 updated govuk frontend, changed crown image #3652

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

CIV-12657 updated govuk frontend, changed crown image #3652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f53800f
CIV-12657 updated govuk frontend, changed crown image
dtortolaV1 Feb 16, 2024
086a765
Merge branch 'master' into CIV-12657-ocmc
dtortolaV1 Feb 19, 2024
ac8d99d
CIV-12657 updated security suppressions
dtortolaV1 Feb 19, 2024
f43671c
Merge remote-tracking branch 'origin/CIV-12657-ocmc' into CIV-12657-ocmc
dtortolaV1 Feb 19, 2024
8a9f763
CIV-12657 updated security suppressions
dtortolaV1 Feb 19, 2024
e20a65e
CIV-12657 updated security suppressions
dtortolaV1 Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"fs": "0.0.2",
"fs-extra": "^9.1.0",
"govuk-elements-sass": "^3.1.3",
"govuk-frontend": "4.6.0",
"govuk-frontend": "5.1.0",
"govuk_template_jinja": "0.26.0",
"gulp": "^4.0.2",
"helmet": "^4.6.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main/views/govukTemplate.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<div class="header-global">
<div class="header-logo">
<a href="{{ homepage_url|default('https://www.gov.uk') }}" title="{{ logo_link_title|default('Go to the GOV.UK homepage') }}" id="logo" class="content">
<img src="{{ asset_paths['images_vendor'] }}/gov.uk_logotype_crown_invert_trans.png?{{ govuk_template_version }}" width="36" height="32" alt=""> {{ global_header_text|default('GOV.UK') }}
<img src="{{ 'govuk-frontend/assets/images' }}/govuk-icon-180.png" width="36" height="32" alt=""> {{ global_header_text|default('GOV.UK') }}
</a>
</div>
{% block inside_header %}{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion src/main/views/macro/support.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<web-chat class="hidden"
chat-title="Money Claims Web Chat"
url="webchat.ctsc.hmcts.net"
chat-icon-url="/img/lib/gov.uk_logotype_crown_invert_trans.png?0.26.0"
chat-icon-url="{{ 'govuk-frontend/assets/images' }}/govuk-icon-180.png"
locale-url="/assets/locale"
api-version="1.0"
Language="English"
Expand Down
4 changes: 2 additions & 2 deletions src/main/views/web-chat.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@

{% block content %}{% endblock %}
{% block contactForHelp %}
{% if antennawebChat %}
{% if antennawebChat %}
<web-chat class="height"
chat-title="Money Claims Web Chat"
url="webchat.ctsc.hmcts.net"
chat-icon-url="/img/lib/gov.uk_logotype_crown_invert_trans.png?0.26.0"
chat-icon-url="{{ 'govuk-frontend/assets/images' }}/govuk-icon-180.png"
locale-url="/assets/locale"
api-version="1.0"
Language="English"
Expand Down
Binary file modified yarn-audit-known-issues
View file
Open in desktop
Binary file not shown.
11 changes: 9 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3438,7 +3438,7 @@ __metadata:
fs: 0.0.2
fs-extra: ^9.1.0
govuk-elements-sass: ^3.1.3
govuk-frontend: 4.6.0
govuk-frontend: 5.1.0
govuk_template_jinja: 0.26.0
gulp: ^4.0.2
gulp-livereload: ^4.0.2
Expand Down Expand Up @@ -6576,7 +6576,14 @@ __metadata:
languageName: node
linkType: hard

"govuk-frontend@npm:4.6.0, govuk-frontend@npm:^4.6.0":
"govuk-frontend@npm:5.1.0":
version: 5.1.0
resolution: "govuk-frontend@npm:5.1.0"
checksum: 8bc32fa2f22319385476b8f4e9b080fb15b17f2487bad59acb68ae683ce027269221d6113b0aa5befb04e7be908f31ee8eefa7958a329e2e3618f912fea93ba8
languageName: node
linkType: hard

"govuk-frontend@npm:^4.6.0":
version: 4.6.0
resolution: "govuk-frontend@npm:4.6.0"
checksum: 025a5b99f59aa84586a221b227c66c9ccf48d1b71e6df69ebd39e055b181328dd59ba392cef9f6a38b108c0b1276ba888619cc51343b2e2f35c668772f2ec472
Expand Down
Loading