govuk_publishing_components 20.3.0 → 20.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f5df7e2c205738cd3d8cd009d6ca2d05c8dd239010e7069f13bcf30abbcd19e
-  data.tar.gz: 06fd2c808c46a8964422df92e7f5c7e7ed17e1e53edd7c64eb5278e420a3220f
+  metadata.gz: be9c34e0c68a4a32acc65f384dd54ac57e84773a5fc4099bdd9c12d20eedbbdd
+  data.tar.gz: e6fcf672363a3b0feee426acc8135e65948802b9dc983d9c8b2eb44a8624b228
 SHA512:
-  metadata.gz: 94dc4d5b1b0dbb6fa1623bf86dc9f261b858837e29ec495bc1d99645409248d0b89777c6450d97ee11f44186fcf2bc1e885fe90bb9ac77d7b2fd2de1db82c3e0
-  data.tar.gz: 27cf0edb974d92114e4fdfa96cbc0d41ba098794800e4fcdbf6e8f76db0811aaf3898f9aa334deda3244e35c2f6ac1ef51834301cba64a858a57db39b17d6555
+  metadata.gz: b56ee33a9621f7e751f113b61505dcadc0590a284374b3af27d33ba0a6d5aea313ed012a64ae156edef9297e7f0a54265da6ce79543ab712b8b3d7bcae4841f2
+  data.tar.gz: 90b2345ffb9bf05079648ef713fbcac8a18899d7cdc361d58c0b4fcad852a91d8d75bfd44c0bf09e19e5f8c3fab454fbf2c26392668e6cad9579e670baa360f7

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -69,6 +69,13 @@ $govuk-cookie-banner-text-green: #00823b;
   display: none;
   position: relative;
   padding: govuk-spacing(1);
+
+
+  // This element is focused using JavaScript so that it's being read out by screen readers
+  // for this reason we don't want to show the default outline or emphasise it visually using `govuk-focused-text`
+  &:focus {
+    outline: none;
+  }
 }
 
 .gem-c-cookie-banner__confirmation-message,
@@ -98,12 +105,15 @@ $govuk-cookie-banner-text-green: #00823b;
   padding: govuk-spacing(0);
   margin-top: govuk-spacing(2);
 
-
   &:hover {
     color: $govuk-link-hover-colour;
     cursor: pointer;
   }
 
+  &:focus {
+    @include govuk-focused-text;
+  }
+
   @include govuk-media-query($from: desktop) {
     margin-top: govuk-spacing(0);
     position: absolute;

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

@@ -7,6 +7,8 @@
   small ||= false
   inline ||= false
   is_page_heading ||= false
+  heading_size = 'm' unless ['s', 'm', 'l', 'xl'].include?(heading_size)
+
   description ||= nil
   hint ||= nil
   error_message ||= nil
@@ -23,6 +25,9 @@
   radio_classes << "govuk-radios--small" if small
   radio_classes << "govuk-radios--inline" if inline
 
+  legend_classes = %w(govuk-fieldset__legend)
+  legend_classes << "govuk-fieldset__legend--#{heading_size}"
+
   aria = "#{hint_id} #{"#{error_id}" if has_error}".strip if hint or has_error
 
   # check if any item is set as being conditional
@@ -33,11 +38,11 @@
 
     <% if heading.present? %>
       <% if is_page_heading %>
-        <%= tag.legend class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title gem-c-title--margin-bottom-5" do %>
+        <%= tag.legend class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title" do %>
           <%= tag.h1 heading, class: "gem-c-title__text" %>
         <% end %>
       <% else %>
-        <%= tag.legend heading, class: "govuk-fieldset__legend govuk-fieldset__legend--m" %>
+        <%= tag.legend heading, class: legend_classes %>
       <% end %>
     <% end %>
 

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

@@ -73,7 +73,7 @@ examples:
       heading: "Choose your favourite skittles"
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
-        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        The interior consists mainly of sugar, corn syrup, and hydrogenated
         palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
       hint_text: "Taste the rainbow"
       items:
@@ -94,7 +94,7 @@ examples:
       is_page_heading: true
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
-        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        The interior consists mainly of sugar, corn syrup, and hydrogenated
         palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
       hint_text: "Taste the rainbow"
       items:
@@ -164,6 +164,18 @@ examples:
           value: "green"
         - label: "Blue"
           value: "blue"
+  with_custom_heading_size:
+    data:
+      name: "favourite_colour"
+      heading: "What is your favourite colour?"
+      heading_size: "s"
+      items:
+        - label: "Red"
+          value: "red"
+        - label: "Green"
+          value: "green"
+        - label: "Blue"
+          value: "blue"
   checkboxes_with_data_attributes:
     description: Data attributes such as tracking can be applied if required. This will fire tracking identical tracking events on check and uncheck. See below to send different events on uncheck.
     data:

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

@@ -126,7 +126,7 @@ examples:
       heading: "What is your favourite colour?"
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
-        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        The interior consists mainly of sugar, corn syrup, and hydrogenated
         palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
       items:
       - value: "red"
@@ -141,7 +141,7 @@ examples:
       heading: "What is your favourite colour?"
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
-        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        The interior consists mainly of sugar, corn syrup, and hydrogenated
         palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
       hint: "Choose the colour"
       items:
@@ -158,7 +158,7 @@ examples:
       is_page_heading: true
       description: |
         Skittles consist of hard sugar shells imprinted with the letter "S".
-        The interior consists mainly of sugar, corn syrup, and hydrogenated 
+        The interior consists mainly of sugar, corn syrup, and hydrogenated
         palm kernel oil along with fruit juice, citric acid, natural and artificial flavors.
       hint: "Choose the colour"
       items:
@@ -168,6 +168,19 @@ examples:
         text: "Green"
       - value: "blue"
         text: "Blue"
+  with_custom_heading_size:
+    data:
+      name: "radio-group-description"
+      heading: "What is your favourite colour?"
+      heading_size: "s"
+      items:
+      - value: "red"
+        text: "Red"
+      - value: "green"
+        text: "Green"
+      - value: "blue"
+        text: "Blue"
+
   with_hint_text_on_radios:
     data:
       name: "radio-group-hint-text"
@@ -308,4 +321,3 @@ examples:
           text: "On"
         - value: "off"
           text: "Off"
-

data/config/locales/en.yml

@@ -24,7 +24,7 @@ en:
     translations: "Translations"
   components:
     attachment:
-      opendocument_html: "This file is in an <a href='https://www.gov.uk/guidance/open-document-format-odf-guidance-for-uk-government/overview-of-productivity-software' target=%{target} class='govuk-link'>OpenDocument</a> format"
+      opendocument_html: "This file is in an <a href='https://www.gov.uk/guidance/using-open-document-formats-odf-in-your-organisation' target=%{target} class='govuk-link'>OpenDocument</a> format"
       request_format_text: "This file may not be suitable for users of assistive technology."
       request_format_cta: "Request a different format"
       request_format_details_html: "If you use assistive technology and need a version of this document in a more accessible format, please email <a href='mailto:%{alternative_format_contact_email}' target='_blank' class='govuk-link'>%{alternative_format_contact_email}</a>. Please tell us what format you need. It will help us if you say what assistive technology you use."

data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text, :description
+      attr_reader :items, :name, :css_classes, :list_classes, :error, :has_conditional, :has_nested, :id, :hint_text, :description, :heading_size
 
       def initialize(options)
         @items = options[:items] || []
@@ -22,6 +22,8 @@ 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)
         @is_page_heading = options[:is_page_heading]
         @description = options[:description] || nil
         @no_hint_text = options[:no_hint_text]
@@ -50,12 +52,13 @@ module GovukPublishingComponents
         if @is_page_heading
           content_tag(
             :legend,
-            class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title gem-c-title--margin-bottom-5"
+            class: "govuk-fieldset__legend govuk-fieldset__legend--xl gem-c-title"
           ) do
             content_tag(:h1, @heading, class: "gem-c-title__text")
           end
         else
-          classes = %w(govuk-fieldset__legend govuk-fieldset__legend--m)
+          classes = %w(govuk-fieldset__legend)
+          classes << "govuk-fieldset__legend--#{@heading_size}"
           classes << "gem-c-checkboxes__legend--hidden" if @visually_hide_heading
 
           content_tag(:legend, @heading, class: classes)

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '20.3.0'.freeze
+  VERSION = '20.4.0'.freeze
 end

metadata

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