govuk_publishing_components 21.10.0 → 21.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b714e4ac16dcb7d35863086c6f857ef31d142bfcc7b80f3fece4a113b96bd7
-  data.tar.gz: 8268154d670cdcfdc51009609e2724c9695dfa5e2f8a782133917dbdf3ab26cb
+  metadata.gz: 2bbeb70eb7086f9fabacb9857824a4a7ba8f11903ff484b2e7556792b593a612
+  data.tar.gz: 0cf68605b66f55385c67d90dee67e1cf193ceff4def3c4caa260273f73f93a0a
 SHA512:
-  metadata.gz: 98c6cc5de694a0496ff98451e8f7a56317b92747b8c0266ca4fb4f43365731d393008fd17f87a9be00e93efa7d7e53203f9c1bd639c6bf2b28e58885950a0c24
-  data.tar.gz: 58b9b92e675013a7c65baa7a91e7d5b9c8cd3c673fa22a13b3bfa75429fdbbe527139b2efb88874d0ab0ed7bfc52d83d4a90414a43fbe5d2d1f4004c621fd3cd
+  metadata.gz: 12de494131da57503893d764422bc097f0cd5a082bccd35e1e48f8fb234feb48a242dae5ffce964422f5c3577dcbcf89d1567b58b8fd2d2ad21d41afa08973ac
+  data.tar.gz: 7fdf11ebf8e5c7bb9e1aae2b4a7f93f8453dfbd0c26053de2673b3b72e11677ae708ef937b7981f66668e6df05f87bb5d3e5b1077dddca675e857abbc68b9b4e

data/app/assets/javascripts/component_guide/filter-components.js

@@ -28,5 +28,8 @@
       var searchTerm = searchField.value;
       window.GOVUK.FilterComponents(searchTerm);
     });
+
+    // trigger search if search query exists in query string on page load
+    window.GOVUK.FilterComponents(searchField.value);
   }
 })();

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -18,12 +18,15 @@
 }
 
 .gem-c-document-list__item-title {
-  @include govuk-link-common;
-  @include govuk-link-style-default;
   @include govuk-font($size: 19, $weight: bold);
   display: inline-block;
 }
 
+.gem-c-document-list__item-link {
+  @include govuk-link-common;
+  @include govuk-link-style-default;
+}
+
 .gem-c-document-list--no-underline {
   .gem-c-document-list__item-title {
     text-decoration: none;

data/app/assets/stylesheets/govuk_publishing_components/components/_organisation-logo.scss

@@ -22,6 +22,11 @@
   direction: ltr;
 }
 
+.gem-c-organisation-logo__container--inline {
+  display: inline-block;
+  padding-right: govuk-spacing(1);
+}
+
 // Scale images on smaller viewports
 .gem-c-organisation-logo__image {
   max-width: 100%;
@@ -61,7 +66,11 @@
   }
 
   &:focus {
+    // Using `@include govuk-focused-text;` would obscure the text. Tweaked
+    // spacing needed to prevent overlap of the text and the focus state's thick
+    // black line.
     box-shadow: 0 -2px $govuk-focus-colour, 0 4px $govuk-focus-colour, 0 8px $govuk-focus-text-colour;
+    text-decoration: none;
   }
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss

@@ -159,11 +159,11 @@ $large-input-size: 50px;
 .gem-c-search--on-white {
 
   .gem-c-search__submit {
-    background-color: govuk-colour("light-blue");
+    background-color: govuk-colour("blue");
     color: govuk-colour("white");
 
     &:hover {
-      background-color: lighten(govuk-colour("light-blue"), 5%);
+      background-color: lighten(govuk-colour("blue"), 5%);
     }
   }
 

data/app/views/govuk_publishing_components/components/_document_list.html.erb

@@ -24,13 +24,25 @@
         <% if item[:highlight] && item[:highlight_text] %>
           <p class='gem-c-document-list__highlight-text'><%= item[:highlight_text] %></p>
         <% end %>
+
         <%=
-          link_to(
-            item[:link][:text],
-            item[:link][:path],
-            data: item[:link][:data_attributes],
-            class: "gem-c-document-list__item-title #{brand_helper.color_class} #{title_with_context_class if item[:link][:context]}"
-          )
+          item_classes = "gem-c-document-list__item-title #{brand_helper.color_class} #{title_with_context_class if item[:link][:context]}"
+
+          if item[:link][:path]
+            link_to(
+              item[:link][:text],
+              item[:link][:path],
+              data: item[:link][:data_attributes],
+              class: "#{item_classes} gem-c-document-list__item-link",
+            )
+          else
+            content_tag(
+              "span",
+              item[:link][:text],
+              data: item[:link][:data_attributes],
+              class: item_classes,
+            )
+          end
         %>
 
         <% if item[:link][:context] %>

data/app/views/govuk_publishing_components/components/_organisation_logo.html.erb

@@ -1,21 +1,42 @@
 <%
   logo_helper = GovukPublishingComponents::Presenters::OrganisationLogoHelper.new(local_assigns)
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(organisation[:brand])
+
   organisation ||= {}
+  heading_level ||= false
+  inline ||= false
+
+  # Check if `heading_level` is a number; if so, check if it's an appropriate
+  # number.
+  use_heading = heading_level.is_a?(Integer) ?
+                  (heading_level >= 1 && heading_level <= 6) :
+                  false
+
+  # Set the wrapping element to be a heading or a `div`
+  wrapping_element = use_heading ? "h#{heading_level}" : "div"
+
+  wrapper_classes = %w(gem-c-organisation-logo)
+  wrapper_classes << brand_helper.brand_class
+
+  container_classes = [
+    logo_helper.logo_container_class,
+    brand_helper.border_color_class
+  ]
+  container_classes << "gem-c-organisation-logo__container--inline" if inline
 %>
-<div
-  class="gem-c-organisation-logo <%= brand_helper.brand_class %>"
+<<%= wrapping_element %>
+  class="<%= wrapper_classes.join(" ") %>"
   <%= "data-module=track-click" if organisation[:data_attributes] %>
 >
   <% if organisation[:url] %>
     <%= link_to organisation[:url],
-      class: "#{logo_helper.logo_container_class} #{brand_helper.border_color_class}",
+      class: container_classes.join(" "),
       data: organisation[:data_attributes] do %>
       <%= logo_helper.logo_content %>
     <% end %>
   <% else %>
-    <div class="<%= logo_helper.logo_container_class %> <%= brand_helper.border_color_class %>">
+    <div class="<%= container_classes.join(" ") %>">
       <%= logo_helper.logo_content %>
     </div>
   <% end %>
-</div>
+</<%= wrapping_element %>>

data/app/views/govuk_publishing_components/components/docs/document_list.yml

@@ -1,10 +1,10 @@
 name: Document list
-description: An ordered list of links to documents including document type and when updated.
+description: An ordered list of documents including a document type, when updated and a link.
 body: |
-  Outputs a list of links to documents, based on an array of document data. This must include:
+  Outputs a list to documents, based on an array of document data. This may include:
 
-  * link text
-  * link href
+  * document title
+  * link to the document
   * last updated date object
   * document type
 
@@ -39,6 +39,24 @@ examples:
         metadata:
           public_updated_at: 2016-09-05 16:48:27
           document_type: 'Statutory guidance'
+  without_links:
+    data:
+      items:
+      - link:
+          text: 'Alternative provision'
+        metadata:
+          public_updated_at: 2016-06-27 10:29:44
+          document_type: 'Statutory guidance'
+      - link:
+          text: 'Behaviour and discipline in schools: guide for governing bodies'
+        metadata:
+          public_updated_at: 2015-09-24 16:42:48
+          document_type: 'Statutory guidance'
+      - link:
+          text: 'Children missing education'
+        metadata:
+          public_updated_at: 2016-09-05 16:48:27
+          document_type: 'Statutory guidance'
   with_data_attributes_on_links:
     data:
       items:

data/app/views/govuk_publishing_components/components/docs/organisation_logo.yml

@@ -6,8 +6,12 @@ body: |
 
   Alternatively a custom organisation logo can be provided as an image.
 
-  Data tracking attributes can be provided to add tracking to each organisation logo.
-  This will only apply to organisations with a link. Example here: [with_data_attributes](/component-guide/organisation_logo/with_data_attributes)
+  Data tracking attributes can be provided to add tracking to each organisation logo. This will only apply to organisations with a link. Example here: [with_data_attributes](/component-guide/organisation_logo/with_data_attributes)
+
+  The logo can optionally be wrapped in a heading.
+
+  The logo can be set to not take up the full width of the parent container with the `inline` option.
+
 accessibility_criteria: |
   The crest image itself must be presentational and ignored by screen readers.
 
@@ -162,3 +166,28 @@ examples:
         name: Cabinet Office
         brand: cabinet-office
         crest: 'single-identity'
+  as_a_heading:
+    description: The `heading_level` option takes a number from 1 to 6.
+    data:
+      organisation:
+        name: Cabinet Office
+        url: '/government/organisations/cabinet-office'
+        brand: cabinet-office
+        crest: 'single-identity'
+      heading_level: 1
+  as_a_heading_without_a_link:
+    data:
+      organisation:
+        name: Cabinet Office
+        brand: cabinet-office
+        crest: 'single-identity'
+      heading_level: 1
+  inline-block:
+    description: This option is useful to stop a large selectable area.
+    data:
+      organisation:
+        name: Cabinet Office
+        url: '/government/organisations/cabinet-office'
+        brand: cabinet-office
+        crest: 'single-identity'
+      inline: true

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '21.10.0'.freeze
+  VERSION = '21.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.10.0
+  version: 21.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters