Merge pull request #397 from alphagov/revert-391-use-service-link-for-favicon

Revert "Use the service link as the start of the path to the favicon images"

Author: kr8n3r

CHANGELOG.md

@@ -4,8 +4,6 @@
 
 - [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

lib/source/layouts/core.erb

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