govuk-components 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a251ce9b412d46a7fd70155a08ba3cc2f6e9830baca832622bdeb459936b791f
-  data.tar.gz: 85cccf721573ce9c734d7156de9da9c1ceefc22cac05888d8163d9441420be7b
+  metadata.gz: 1ff2f2871745bc313242de390b143fd475f0983e6ddf03c627512d26e5c52b8c
+  data.tar.gz: c191fa0f05fea8fa6bc19d9fddf8528802086a05f63217e4b48079329cf25a87
 SHA512:
-  metadata.gz: c94357e58eee8a5ee0ae6e059f3177e340340d7af7cd19cfc3de607cc3b04e52d62e689a9291cc94ae568a1e1de809e224c566cb82a9b148986346773b45064b
-  data.tar.gz: 89494b6d782f7aaf2e4453fc317c917bb87e6dafabd21cd8b6d0d363ebba546ae2ffbdef43f129d8eaff875f0a3cd1b804a99f271f5a33779fca3ec8fddf2d0b
+  metadata.gz: ea255c815feebd10555c8f403b4cd3ebac0d807cd1f4fe9a34442318a2f95d75cbbe309fb0f18aebbfcc0a7c32ee3bc962c971717fe7f9506ab10844eea8cda0
+  data.tar.gz: 6dada7350b560d7b967fa1bba83231d82173b1f81c90c563d803583fc4d99347a9973e193adda2eb58af86a86183d5e22d3b17d5e7be3aa9fb0ec8066af75c04

data/app/components/govuk_component/cookie_banner_component/message_component.rb

@@ -51,7 +51,7 @@ private
   def wrap_in_p(message_text)
     return if message_text.blank?
 
-    tag.p(message_text)
+    tag.p(message_text, class: "govuk-body")
   end
 
   def actions_element

data/app/components/govuk_component/header_component.html.erb

@@ -7,11 +7,19 @@
             <%= custom_logo %>
           <% else %>
             <% if crown %>
+              <!--[if gt IE 8]><!-->
               <svg aria-hidden="true" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="30" width="36">
                 <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-                <image src="/assets/images/govuk-logotype-crown.png" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
               </svg>
+              <!--<![endif]-->
             <% end %>
+
+            <% if crown_fallback_image_path.present? %>
+              <!--[if IE 8]>
+                <%= image_tag(crown_fallback_image_path, **crown_fallback_image_attributes) %>
+              <![endif]-->
+            <% end %>
+
             <%= tag.span(logotype, class: "govuk-header__logotype-text") %>
           <% end %>
         </span>
@@ -32,9 +40,7 @@
           <nav>
             <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
               <% navigation_items.each do |item| %>
-                <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
-                  <%= item %>
-                <% end %>
+                <%= item %>
               <% end %>
             <% end %>
           </nav>

data/app/components/govuk_component/header_component.rb

@@ -5,6 +5,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
   attr_reader :logotype,
               :crown,
+              :crown_fallback_image_path,
               :homepage_url,
               :service_name,
               :service_url,
@@ -17,6 +18,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
                  html_attributes: {},
                  logotype: 'GOV.UK',
                  crown: true,
+                 crown_fallback_image_path: nil,
                  homepage_url: '/',
                  menu_button_label: 'Show or hide navigation menu',
                  navigation_classes: [],
@@ -29,6 +31,7 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
     @logotype                  = logotype
     @crown                     = crown
+    @crown_fallback_image_path = crown_fallback_image_path
     @homepage_url              = homepage_url
     @service_name              = service_name
     @service_url               = service_url
@@ -52,6 +55,14 @@ private
     combine_classes(%w(govuk-header__container govuk-width-container), custom_container_classes)
   end
 
+  def crown_fallback_image_attributes
+    {
+      class: "govuk-header__logotype-crown-fallback-image",
+      width: "36",
+      height: "32",
+    }
+  end
+
   class NavigationItem < GovukComponent::Base
     attr_reader :text, :href, :options, :active
 
@@ -61,17 +72,16 @@ private
       @text    = text
       @href    = href
       @options = options
-      @active  = active
-    end
 
-    def active?
-      return current_page?(href) if active.nil?
+      @active_override = active
+    end
 
-      active
+    def before_render
+      @active = active?(@active_override)
     end
 
     def active_class
-      %w(govuk-header__navigation-item--active) if active?
+      %w(govuk-header__navigation-item--active) if @active
     end
 
     def link?
@@ -79,15 +89,23 @@ private
     end
 
     def call
-      if link?
-        link_to(text, href, **options, class: "govuk-header__link")
-      else
-        text
+      tag.li(class: classes.append(active_class), **html_attributes) do
+        if link?
+          link_to(text, href, **options, class: "govuk-header__link")
+        else
+          text
+        end
       end
     end
 
   private
 
+    def active?(active_override)
+      return current_page?(href) if active_override.nil?
+
+      active_override
+    end
+
     def default_classes
       %w(govuk-header__navigation-item)
     end

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.1.2'.freeze
+    VERSION = '2.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -220,7 +220,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,8 +235,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []