Skip to content

Use the service link as the start of the path to the favicon images #391

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

Merged
merged 5 commits into from
Apr 30, 2025
Merged

Use the service link as the start of the path to the favicon images #391

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c2cfea
Use the service link as the start of the path to the images
johnsgp Apr 23, 2025
a3d3c24
Changelog entry for PR 391
johnsgp Apr 25, 2025
978e6ff
Incorrectly applied the change to manifest.json
johnsgp Apr 25, 2025
8d06b48
Fixed link to manifest.json
johnsgp Apr 25, 2025
9ba3fc7
Do not use the service_link for the Development environment
johnsgp Apr 28, 2025
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

- [Fix: Update Rack::File to Rack::Files in test specs](https://github.com/alphagov/tech-docs-gem/pull/394)

- [Fix: Use the service link as the start of the path to the favicon images](https://github.com/alphagov/tech-docs-gem/pull/391)

## 4.2.0

## New features
Expand Down
17 changes: 12 additions & 5 deletions lib/source/layouts/core.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@

<link rel="canonical" href="<%= meta_tags.canonical_url %>">
<% if config[:tech_docs][:show_govuk_logo] %>
<link rel="icon" sizes="48x48" href="/assets/govuk/assets/images/favicon.ico">
<link rel="icon" sizes="any" href="/assets/govuk/assets/images/favicon.svg" type="image/svg+xml">
<link rel="mask-icon" href="/assets/govuk/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
<link rel="apple-touch-icon" href="/assets/govuk/assets/images/govuk-icon-180.png">
<link rel="manifest" href="/assets/govuk/assets/manifest.json">
<%
service_link = config[:tech_docs][:service_link] || '/'
# ensure service_link ends with a trailing '/'
if service_link[-1, 1] != '/'
service_link += '/'
end
%>
<link rel="icon" sizes="48x48" href="<%= service_link %>assets/govuk/assets/images/favicon.ico">
<link rel="icon" sizes="any" href="<%= service_link %>assets/govuk/assets/images/favicon.svg" type="image/svg+xml">
<link rel="mask-icon" href="<%= service_link %>assets/govuk/assets/images/govuk-icon-mask.svg" color="#0b0c0c">
<link rel="apple-touch-icon" href="<%= service_link %>assets/govuk/assets/images/govuk-icon-180.png">
<link rel="manifest" href="<%= service_link %>assets/govuk/assets/images/manifest.json">
<% else %>
<link rel="icon" sizes="48x48" href="/images/favicon.ico">
<link rel="icon" sizes="any" href="/images/favicon.svg" type="image/svg+xml">
Expand Down