govuk_publishing_components 21.42.0 → 21.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24829cd84e2ddb267b818d1d885391681240e46cac461922e7389dc173c797c6
-  data.tar.gz: 1e07e232b562ebfc957807cc4c08a28ce29d3d7b4ae5c31ad00283f5ce30f651
+  metadata.gz: 8fbab4c4935ddd5876ef31433f8fbfbd3dc7289928bbdd9baab16f59f84b81e9
+  data.tar.gz: 9b90c661ad7d473726a88c4763e4dac161f09b80bc091e4a9985880ed2c86cd4
 SHA512:
-  metadata.gz: a59631eac2c60297c23f7fac1b136baa6d4ed48a75d03aace3ddd5b9eba136d39c772df2602bb88d7336824e581137acf8a3a78e273a1b681241183eb9155f43
-  data.tar.gz: 45bfd361a06cfcff26f939f5469c6e6f1c9790059fdb63ae3556b731308e1a6ae86e60be28c01c94b67ed3fa7dfaea0803dd737607023f59ebd8876b11aec84f
+  metadata.gz: c6efa64dea7e1b4ec9392b80805697479a3faf46a5dd462f655e875ec06ca1b0dacc9a644da2335c449f57ee29579e98b22f055358c2567fea4e224f34fa806d
+  data.tar.gz: 6c65d073df5f1e5e21435b5dac6e4bfa6381b9edb0ea212520abe123bdbdf41462f9324bf4828d73151f511d69bf06d4afcf9c296794c3c9a069d71891a9d4f1

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

@@ -18,7 +18,8 @@ $gem-quiet-button-hover-colour: darken($gem-quiet-button-colour, 5%);
 // this will be moved and extended into a model for general component spacing
 // once this has been decided upon and other work completed, see:
 // https://trello.com/c/KEkNsxG3/142-3-implement-customisable-spacing-for-components
-.gem-c-button--bottom-margin {
+.gem-c-button--bottom-margin,
+.gem-c-button__info-text--bottom-margin {
   @include responsive-bottom-margin;
 }
 

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-header.scss

@@ -3,26 +3,24 @@
   position: relative;
   padding: 10px;
   background: govuk-colour("light-grey", $legacy: "grey-4");
-  border-top: solid 1px govuk-colour("mid-grey", $legacy: "grey-2");
-  border-bottom: solid 1px govuk-colour("mid-grey", $legacy: "grey-2");
+  border-bottom: solid 1px govuk-colour("blue");
+  margin-top: govuk-spacing(3);
 
   @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(3);
+    padding: govuk-spacing(5);
   }
 }
 
 // scss-lint:disable SelectorFormat
 
 .gem-c-step-nav-header__part-of {
-  @include govuk-font(16, $weight: bold);
-
+  @include govuk-font(19, $weight: bold);
   display: block;
-  padding-bottom: .2em;
 }
 
 .gem-c-step-nav-header__title {
   @extend %govuk-link;
-  @include govuk-font(24, $weight: bold);
+  @include govuk-font(24, $weight: bold, $line-height: 1);
 }
 
 // scss-lint:enable SelectorFormat

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -109,7 +109,7 @@ module GovukPublishingComponents
     end
 
     def component_breadcrumb(component_doc, component_example = nil)
-      Hash.new.tap do |h|
+      {}.tap do |h|
         h[:title] = component_doc.name
         h[:url] = component_doc_path(component_doc.id) if component_example
       end

data/app/models/govuk_publishing_components/component_doc.rb

@@ -75,7 +75,7 @@ module GovukPublishingComponents
 
     def examples
       @examples ||= component[:examples].map do |id, example_data|
-        example_data = example_data || {}
+        example_data ||= {}
         example_data["embed"] ||= embed
         ComponentExample.new(id.to_s, example_data)
       end

data/app/models/govuk_publishing_components/component_docs.rb

@@ -45,7 +45,7 @@ module GovukPublishingComponents
     end
 
     def parse_documentation(file)
-      { id: File.basename(file, ".yml") }.merge(YAML::load_file(file)).with_indifferent_access
+      { id: File.basename(file, ".yml") }.merge(YAML.load_file(file)).with_indifferent_access
     end
 
     def app_documentation_directory

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

@@ -22,5 +22,5 @@
 <% end %>
 
 <% if button.info_text %>
-  <%= tag.span button.info_text, class: "gem-c-button__info-text" %>
+  <%= tag.span button.info_text, class: button.info_text_classes %>
 <% end %>

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

@@ -62,6 +62,13 @@ examples:
       href: "#"
       start: true
       info_text: "Sometimes you want to explain where a user is going to."
+  start_now_button_with_info_text_and_margin_bottom:
+    data:
+      text: "Start now"
+      href: "#"
+      start: true
+      info_text: "Sometimes you want to explain where a user is going to and have a margin bottom"
+      margin_bottom: true
   with_margin_bottom:
     description: "Sometimes it's useful to break up a page, for example if a button is at the bottom of a page."
     data:

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

@@ -16,6 +16,10 @@ examples:
     data:
       title: 'Having children: step by step'
       path: /childcare-parenting/pregnancy-and-birth
+  with_a_long_text:
+    data:
+      title: 'Coronavirus: businesses and self-employed people'
+      path: /childcare-parenting/pregnancy-and-birth
   with_unique_tracking:
     description: In order to identify the step by step navigation the component is part of, we need to track a unique ID of the navigation in Google Analytics. This ID should be the same across all pages that are linked from and are part of that navigation. Its value is included in any tracking events, specifically in dimension96. It refers to the ID of the step nav that the component links to.
     data:

data/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 return unless Rails.application.config.respond_to?(:assets)
 
 # GOV.UK Publishing Components assets
-Rails.application.config.assets.precompile += %w(
+Rails.application.config.assets.precompile += %w[
   component_guide/accessibility-test.js
   component_guide/application.js
   component_guide/filter-components.js
@@ -25,16 +25,16 @@ Rails.application.config.assets.precompile += %w(
   govuk_publishing_components/icon-important.svg
   govuk_publishing_components/chevron-banner/*.svg
   govuk_publishing_components/crests/*.png
-)
+]
 
 # GOV.UK Frontend assets
-Rails.application.config.assets.precompile += %w(
+Rails.application.config.assets.precompile += %w[
   govuk-logotype-crown.png
-)
+]
 
-Rails.application.config.assets.paths += %W(
+Rails.application.config.assets.paths += %W[
   #{__dir__}/../../node_modules/govuk-frontend/govuk/assets/images
   #{__dir__}/../../node_modules/govuk-frontend/govuk/assets/fonts
   #{__dir__}/../../node_modules/govuk-frontend/
   #{__dir__}/../../node_modules/
-)
+]

data/lib/generators/govuk_publishing_components/component_generator.rb

@@ -26,9 +26,9 @@ module GovukPublishingComponents
   private
 
     def create_directory_if_not_exists(dir)
-      if not File.directory?(dir)
+      if !File.directory?(dir)
         puts("Directory #{dir} not found, creating")
-        FileUtils::mkdir_p dir
+        FileUtils.mkdir_p dir
       end
     end
   end

data/lib/govuk_publishing_components/app_helpers/table_helper.rb

@@ -4,10 +4,10 @@ module GovukPublishingComponents
       def self.helper(context, caption = nil, opt = {})
         builder = TableBuilder.new(context.tag)
 
-        classes = %w(gem-c-table govuk-table)
+        classes = %w[gem-c-table govuk-table]
         classes << "govuk-table--sortable" if opt[:sortable]
 
-        caption_classes = %w(govuk-table__caption)
+        caption_classes = %w[govuk-table__caption]
         caption_classes << opt[:caption_classes] if opt[:caption_classes]
 
         context.tag.table class: classes do
@@ -46,17 +46,17 @@ module GovukPublishingComponents
         end
 
         def header(str, opt = {})
-          classes = %w(govuk-table__header)
+          classes = %w[govuk-table__header]
           classes << "govuk-table__header--#{opt[:format]}" if opt[:format]
           classes << "govuk-table__header--active" if opt[:sort_direction]
-          link_classes = %w(app-table__sort-link)
+          link_classes = %w[app-table__sort-link]
           link_classes << "app-table__sort-link--#{opt[:sort_direction]}" if opt[:sort_direction]
           str = link_to str, opt[:href], class: link_classes, data: opt[:data_attributes] if opt[:href]
           tag.th str, class: classes, scope: opt[:scope] || "col"
         end
 
         def cell(str, opt = {})
-          classes = %w(govuk-table__cell)
+          classes = %w[govuk-table__cell]
           classes << "govuk-table__cell--" + opt[:format] if opt[:format]
           classes << "govuk-table__cell--empty" unless str
           str ||= "Not set"

data/lib/govuk_publishing_components/presenters/breadcrumbs.rb

@@ -18,9 +18,9 @@ module GovukPublishingComponents
       attr_reader :breadcrumbs
 
       def item_list_element
-        breadcrumbs.each_with_index.map { |crumb, index| Breadcrumb.new(crumb, index) }.
-          select(&:is_link?).
-          map(&:item_list_element)
+        breadcrumbs.each_with_index.map { |crumb, index| Breadcrumb.new(crumb, index) }
+          .select(&:is_link?)
+          .map(&:item_list_element)
       end
     end
 

data/lib/govuk_publishing_components/presenters/button_helper.rb

@@ -3,16 +3,20 @@ require "action_view"
 module GovukPublishingComponents
   module Presenters
     class ButtonHelper
-      attr_reader :href, :text, :title, :info_text, :rel, :data_attributes,
-                  :margin_bottom, :inline_layout, :target, :type, :start,
-                  :secondary, :secondary_quiet, :destructive, :name, :value,
-                  :classes, :aria_label
+      attr_reader :href, :text, :title, :info_text, :info_text_classes,
+                  :rel, :data_attributes, :margin_bottom, :inline_layout,
+                  :target, :type, :start, :secondary, :secondary_quiet,
+                  :destructive, :name, :value, :classes, :aria_label
 
       def initialize(local_assigns)
         @href = local_assigns[:href]
         @text = local_assigns[:text]
         @title = local_assigns[:title]
         @info_text = local_assigns[:info_text]
+        @info_text_classes = %w[gem-c-button__info-text]
+        if local_assigns[:margin_bottom]
+          @info_text_classes << "gem-c-button__info-text--bottom-margin"
+        end
         @rel = local_assigns[:rel]
         @data_attributes = local_assigns[:data_attributes]
         @margin_bottom = local_assigns[:margin_bottom]
@@ -59,12 +63,12 @@ module GovukPublishingComponents
     private
 
       def css_classes
-        css_classes = %w(gem-c-button govuk-button)
+        css_classes = %w[gem-c-button govuk-button]
         css_classes << "govuk-button--start" if start
         css_classes << "gem-c-button--secondary" if secondary
         css_classes << "gem-c-button--secondary-quiet" if secondary_quiet
         css_classes << "govuk-button--warning" if destructive
-        css_classes << "gem-c-button--bottom-margin" if margin_bottom
+        css_classes << "gem-c-button--bottom-margin" if margin_bottom && !info_text
         css_classes << "gem-c-button--inline" if inline_layout
         css_classes << classes if classes
         css_classes.join(" ")

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -10,12 +10,12 @@ module GovukPublishingComponents
       def initialize(options)
         @items = options[:items] || []
         @name = options[:name]
-        @css_classes = %w(gem-c-checkboxes govuk-form-group)
+        @css_classes = %w[gem-c-checkboxes govuk-form-group]
         @css_classes << "govuk-form-group--error" if options[:error]
         @css_classes << "govuk-checkboxes--small" if options[:small]
         @error = true if options[:error]
 
-        @list_classes = %w(govuk-checkboxes gem-c-checkboxes__list)
+        @list_classes = %w[govuk-checkboxes gem-c-checkboxes__list]
 
         # check if any item is set as being conditional
         @has_conditional = options[:items].any? { |item| item.is_a?(Hash) && item[:conditional] }
@@ -24,7 +24,7 @@ module GovukPublishingComponents
         @id = options[:id] || "checkboxes-#{SecureRandom.hex(4)}"
         @heading = options[:heading] || nil
         @heading_size = options[:heading_size]
-        @heading_size = "m" unless %w(s m l xl).include?(@heading_size)
+        @heading_size = "m" unless %w[s m l xl].include?(@heading_size)
         @heading_caption = options[:heading_caption] || nil
         @is_page_heading = options[:is_page_heading]
         @description = options[:description] || nil
@@ -41,7 +41,7 @@ module GovukPublishingComponents
 
       def fieldset_describedby
         unless @no_hint_text
-          text = %w()
+          text = %w[]
           text << "#{id}-hint" if @hint_text
           text << "#{id}-error" if @error
           text
@@ -60,7 +60,7 @@ module GovukPublishingComponents
             concat content_tag(:h1, @heading, class: "gem-c-title__text")
           end
         else
-          classes = %w(govuk-fieldset__legend)
+          classes = %w[govuk-fieldset__legend]
           classes << "govuk-fieldset__legend--#{@heading_size}"
           classes << "gem-c-checkboxes__legend--hidden" if @visually_hide_heading
 

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -12,7 +12,7 @@ module GovukPublishingComponents
         @nested = !!@contents.find { |c| c[:items] && c[:items].any? }
         @format_numbers = options[:format_numbers]
 
-        @classes = %w(gem-c-contents-list)
+        @classes = %w[gem-c-contents-list]
         @classes << " gem-c-contents-list--no-underline" unless options[:underline_links]
       end
 
@@ -26,7 +26,7 @@ module GovukPublishingComponents
       end
 
       def wrap_numbers_with_spans(content_item_link)
-        content_item_text = strip_tags(content_item_link) #just the text of the link
+        content_item_text = strip_tags(content_item_link) # just the text of the link
 
         # Must start with a number
         # Number must be between 1 and 999 (ie not 2014)
@@ -36,7 +36,7 @@ module GovukPublishingComponents
         number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(content_item_text)
 
         if number
-          words = content_item_text.sub(number.to_s, "").strip #remove the number from the text
+          words = content_item_text.sub(number.to_s, "").strip # remove the number from the text
           content_item_link.sub(content_item_text, "<span class=\"gem-c-contents-list__number\">#{number} </span><span class=\"gem-c-contents-list__numbered-text\">#{words}</span>").squish.html_safe
         else
           content_item_link

data/lib/govuk_publishing_components/presenters/machine_readable/article_schema.rb

@@ -44,7 +44,7 @@ module GovukPublishingComponents
       end
 
       def search_description
-        I18n.t(:scoped_search_description, scope: %i(components article_schema), title: page.title)
+        I18n.t(:scoped_search_description, scope: %i[components article_schema], title: page.title)
       end
     end
   end

data/lib/govuk_publishing_components/presenters/machine_readable/organisation_schema.rb

@@ -44,7 +44,7 @@ module GovukPublishingComponents
       end
 
       def ministers_with_grouped_roles
-        ministers.reduce({}) do |grouped, minister|
+        ministers.each_with_object({}) do |minister, grouped|
           person_schema = person_schema_for_minister(minister)
 
           if grouped.has_key? person_schema
@@ -52,7 +52,6 @@ module GovukPublishingComponents
           else
             grouped[person_schema] = [role_for_minister(minister)]
           end
-          grouped
         end
       end
 
@@ -129,7 +128,7 @@ module GovukPublishingComponents
       end
 
       def search_description
-        I18n.t(:all_content_search_description, scope: %i(components organisation_schema), organisation: page.title)
+        I18n.t(:all_content_search_description, scope: %i[components organisation_schema], organisation: page.title)
       end
 
       def organisation_facet_params

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -84,7 +84,7 @@ module GovukPublishingComponents
           slug_without_theme = base_path[%r{/[^/]+/(.+)}, 1]
           # Return the slug without the theme, or in the special case of a root taxon,
           # just return the full slug (because it doesn't have a slug beneath the theme)
-          slug_without_theme || base_path.sub(%r(^/), "")
+          slug_without_theme || base_path.sub(%r{^/}, "")
         end
         taxon_ids = taxons.map { |taxon| taxon[:content_id] }
 
@@ -123,7 +123,7 @@ module GovukPublishingComponents
         parent_taxons = links[:parent_taxons] || links[:taxons] unless links.nil?
 
         if parent_taxons.blank?
-          root_taxon_set << content_item[:base_path].sub(%r(^/), "") if content_item[:document_type] == "taxon"
+          root_taxon_set << content_item[:base_path].sub(%r{^/}, "") if content_item[:document_type] == "taxon"
         else
           parent_taxons.each do |parent_taxon|
             root_taxon_set += root_taxon_slugs(parent_taxon)

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -4,14 +4,14 @@ module GovukPublishingComponents
     # Only used by the related_navigation component
     class RelatedNavigationHelper
       MAX_SECTION_LENGTH = 5
-      DEFINED_SECTIONS = %w(
+      DEFINED_SECTIONS = %w[
         related_guides
         topics
         collections
         topical_events
         world_locations
         statistical_data_sets
-      ).freeze
+      ].freeze
       WORLD_LOCATION_SPECIAL_CASES = {
         "UK Mission to the European Union" => "uk-mission-to-the-eu",
       }.freeze

data/lib/govuk_publishing_components/presenters/translation_nav_helper.rb

@@ -22,7 +22,7 @@ module GovukPublishingComponents
       end
 
       def classes
-        classes = %w(gem-c-translation-nav)
+        classes = %w[gem-c-translation-nav]
         classes << inverse_class if @inverse
         classes << margin_class if @no_margin_top
         classes.join(" ")

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "21.42.0".freeze
+  VERSION = "21.43.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 21.42.0
+  version: 21.43.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters