govuk_tech_docs 4.1.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8841e718fe072372cd281eafe72f331dee10d7c5beb8f02afaba8c8472adccb7
-  data.tar.gz: 11dab6217737ba9fa9d1c1057a620e12bd810d6c133b64e8f2d6eee40e698b8c
+  metadata.gz: 4a331ce0ed0284aa211127a3fe376cc99ec4bd5d187719420411326f655914b0
+  data.tar.gz: e19942e5fbc892aeed1a7afa001704edb59e3ceef06ea249015d5f019b4e06e0
 SHA512:
-  metadata.gz: 82d6f742cfbe4619a9ffc77c3c19d011d0292ce514be213a70c5aab407132d98b0515a89b94de53367c46fa22b3c11237a631bd3b39198945ffd655efd09ad6f
-  data.tar.gz: 14c8bb34c9b140edfb7d114887119306fe70c140a6ad343946e5ba152767ad99a417946874795c6778387a8d35da0d20b60e486eb4b4942420ad99a40d318a79
+  metadata.gz: d1d5587e90903496036c3c3f12420aaabe505416a47c9be4368d2d21df84db2b6d2e38972697339b0207d83cf1cfe771b3ad35d8d569e51b1d27a99de6f436ca
+  data.tar.gz: 84bb340e57ac4a98bd74adf68dc904b6d38f57224de3f0c32beb26239cfbdebb1c72ef43ae4192315a70084202d65bb480511c613f3a9bf885f3575b6112ece2

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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)
+
+- [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
+
+- [Allow non-GOV.UK favicon and opengraph assets](https://github.com/alphagov/tech-docs-gem/pull/387)
+
+To use a non-crown assets, you need to 
+- add `favicon.ico`, `favicon.svg` and `opengraph-image.png` to your `source/images` folder.
+- set `show_govuk_logo: false`
+
 ## 4.1.2
 
 ## Fixes

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/meta_tags.rb

@@ -48,7 +48,11 @@ module GovukTechDocs
     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}/images/opengraph-image.png"
+      end
     end
 
     def site_name

data/lib/govuk_tech_docs/version.rb

@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "4.1.2".freeze
+  VERSION = "4.3.0".freeze
 end

data/lib/source/layouts/core.erb

@@ -10,11 +10,27 @@
     <%= 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] %>
+      <%
+        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">
+    <% else %>
+      <link rel="icon" sizes="48x48" href="/images/favicon.ico">
+      <link rel="icon" sizes="any" href="/images/favicon.svg" type="image/svg+xml">
+    <% end %>
 
     <% meta_tags.tags.each do |name, content| %>
       <%= tag :meta, name: name, content: content %>