Skip to content

Commit

Permalink
Conditional favicon and crown assets
Browse files Browse the repository at this point in the history
Only use them if `show_govuk_logo' config setting is set to true

Fixes: #347
  • Loading branch information
kr8n3r committed Sep 18, 2024
1 parent eebd64b commit bc8bda9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
6 changes: 5 additions & 1 deletion lib/govuk_tech_docs/meta_tags.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ def canonical_url
attr_reader :config, :current_page

def page_image
"#{host}/assets/govuk/assets/images/govuk-opengraph-image.png"
if config[:tech_docs][:show_govuk_logo]
"#{host}/assets/govuk/assets/images/govuk-opengraph-image.png"
else
"#{host}/assets/govuk/assets/images/default-opengraph-image.png"
end
end

def site_name
Expand Down
22 changes: 13 additions & 9 deletions lib/source/layouts/core.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,24 @@

<%= stylesheet_link_tag :manifest %>
<link rel="canonical" href="<%= meta_tags.canonical_url %>">
<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">
<% if config[:tech_docs][:show_govuk_logo] %>
<link rel="canonical" href="<%= meta_tags.canonical_url %>">
<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">

<% meta_tags.opengraph_tags.each do |property, content| %>
<%= tag :meta, property: property, content: content %>
<% end %>
<% end %>
<% meta_tags.tags.each do |name, content| %>
<%= tag :meta, name: name, content: content %>
<% end %>
<% meta_tags.opengraph_tags.each do |property, content| %>
<%= tag :meta, property: property, content: content %>
<% end %>
<%= yield_content :head %>
</head>
Expand Down

0 comments on commit bc8bda9

Please sign in to comment.