govuk_tech_docs 4.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c114ef827fc1b01f302f750a3191551d57b58f5beb85486bb4d9fd93a215da
-  data.tar.gz: ae107761242ea52f0d4104316931d748ecc5b9654a59759d5fa121d207c2160d
+  metadata.gz: fa9aa9b04c96475883c6eefccd842c4514442cd2e86211eaf11d702174fe00bc
+  data.tar.gz: 310b586532f7f0be04d6f80565f83da9160004ccda9dd5091f28fde7cf756d8a
 SHA512:
-  metadata.gz: 1c2d338a2b5c96c3cc1a711f5875a60f576e1a4490102c7a543b040686e7b885aa048a4946067a1e787f4ae78dea3c6b678442f5f3652e5545f236d14f331aa8
-  data.tar.gz: c6e5b6de36c342c566d70bbb9fbafe9c9af0e0d2eae1704f3c90e7626d90e1580da6201c5c683643f70edef578f44067c8806f036375f3ee6c0d06cee54df967
+  metadata.gz: 4a5a5bc7b42ed7535e942797d3fe30d79bd292fe77639828f395d71e41bf0c39362de6ba3d5fabdf2f8e67a2784b31282267718060a733a397ee987453690f8e
+  data.tar.gz: fd60adb788a6cec93b734c664a61b5e9e69234559823b509936390453135d9e10a08107eec645f7b6dd93d14bf06e26bc8892b00d26560b182a4b0840bbbf807

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 4.4.0
+
+### New features
+
+- [Use the service link as the start of the path to the favicon images if required](https://github.com/alphagov/tech-docs-gem/pull/399)
+
+To use the service_link at the start of the path to the favicon images, you need to
+- set `use_service_link_for_favicon: true`
+
+## 4.3.1
+
+- Revert [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.3.0
+
+- [Bump govuk-frontend to v5.9.0 and pin middleman to v4.5.1](https://github.com/alphagov/tech-docs-gem/pull/390)
+
+- [Fix: Update Rack::File to Rack::Files in test specs](https://github.com/alphagov/tech-docs-gem/pull/394)
+
 ## 4.2.0
 
 ## New features

data/govuk_tech_docs.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby", "1.3.4" # 1.3.5 introduced a change that breaks activesupport, and so middleman
   spec.add_dependency "csv" # TODO: remove once tilt declares this itself.
   spec.add_dependency "haml", "~> 6.0"
-  spec.add_dependency "middleman", "~> 4.0"
+  spec.add_dependency "middleman", "4.5.1" # remove pin once https://github.com/middleman/middleman/issues/2818 is fixed
   spec.add_dependency "middleman-autoprefixer", "~> 2.10"
   spec.add_dependency "middleman-compass", "~> 4.0"
   spec.add_dependency "middleman-livereload"

data/lib/assets/stylesheets/_govuk_tech_docs.scss

@@ -7,6 +7,9 @@ $govuk-suppressed-warnings: (
 );
 $govuk-assets-path: "/assets/govuk/assets/" !default;
 
+// legacy palette is getting deprecated so new one needs to be used
+$govuk-new-organisation-colours: true;
+
 // Include only the bits of GOV.UK Frontend we need
 $govuk-new-link-styles: true;
 @import "govuk/base";

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "4.2.0".freeze
+  VERSION = "4.4.0".freeze
 end

data/lib/source/layouts/core.erb

@@ -11,11 +11,24 @@
 
     <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">
+      <%
+        path_prefix =
+          if !development? && config[:tech_docs][:use_service_link_for_favicon]
+            service_link = config[:tech_docs][:service_link] || '/'
+            # ensure service_link ends with a trailing '/'
+            if service_link[-1, 1] != '/'
+              service_link += '/'
+            end
+            service_link
+          else
+            '/'
+          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">
     <% else %>
       <link rel="icon" sizes="48x48" href="/images/favicon.ico">
       <link rel="icon" sizes="any" href="/images/favicon.svg" type="image/svg+xml">