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.

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

Remove image path from favicon link tags #1161

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions app/views/layouts/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
<%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>

<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="favicon.ico" type="image/x-icon">
<link rel="mask-icon" href="govuk-mask-icon.svg" color="#0b0c0c">
<%= favicon_link_tag image_path('favicon.ico'), type: nil, sizes: "48x48" %>
<%= favicon_link_tag image_path('favicon.svg'), type: 'image/svg+xml', sizes: "any" %>
<%= favicon_link_tag image_path('govuk-icon-mask.svg'), rel: 'mask-icon', color: "#0b0c0c", type: nil %>
<%= favicon_link_tag image_path('govuk-icon-180.png'), rel: 'apple-touch-icon', type: nil %>
<%= favicon_link_tag 'favicon.ico', type: nil, sizes: "48x48" %>
<%= favicon_link_tag 'favicon.svg', type: 'image/svg+xml', sizes: "48x48" %>
<%= favicon_link_tag 'govuk-icon-mask.svg', rel: 'mask-icon', color: "#0b0c0c", type: nil %>
<%= favicon_link_tag 'govuk-icon-180.png', rel: 'apple-touch-icon', type: nil %>

<%= tag :meta, property: 'og:image', content: image_path('govuk-opengraph-image.png') %>
<%= tag :meta, property: 'og:image', content: 'govuk-opengraph-image.png' %>

<%= stylesheet_link_tag "main" %>
<%= javascript_include_tag "main", defer: true %>
Expand Down
1 change: 1 addition & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/govuk-icon-180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/govuk-icon-mask.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/govuk-opengraph-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions spec/system/trn_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,8 @@ def given_the_service_is_open

def given_the_service_is_closed
FeatureFlag.deactivate(:service_open)
p ENV.fetch("SUPPORT_USERNAME")
p ENV.fetch("SUPPORT_PASSWORD")
end

def given_the_use_dqt_api_itt_providers_feature_is_enabled
Expand Down
Loading