govuk_publishing_components 53.0.0 → 54.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30fda3ff179316f100982d0cfba8cfde4b1c66b1774ffb3c58f0f4fba2718349
-  data.tar.gz: 718923c362bc6cb9006796a01c4a9ac56eacb1a44cb454db59489cbb3fc71364
+  metadata.gz: 86dda672f3ba9aab6652fe7a61262828fcbf325846d677dac46bf3acbee0288d
+  data.tar.gz: c6fdf3be956c6c65886324672be78cd312f3a2b89f8cc3707410dfa1404e7c8d
 SHA512:
-  metadata.gz: fed49a157451bdea9c8fbfaacbdcf52847abe0bdeafdf9c06d227e9dacc3450fd5cc92fb8df4ec07bf5b25ed93e2ee7fd5d07d10f0408bbb0273f8c5d8cd72c5
-  data.tar.gz: f3e4c027b49b5a4e39e68020ff1761dd6c7ca9306e1b0a8350312c8a7db316aa2412c67ef41039a8fbb52439440654905ef3f68042044802e597dad009c234b8
+  metadata.gz: 4e72340ed40f1523cda2b245a131fb54c042af7d1f2968a5202e8416aef9cc7fa936582df26d4fbb6fa9f9bb422c46cf215cbc9078627a6f3b199f5b6d12d7e7
+  data.tar.gz: ecbe763dc4259ff481dccfedba4a08827b131f070cacddeab8bd429d3d5af40348906645c23f1a0ff7c6bb51d62f1e5dfeac67ea149375a7f3ee797382d0f171

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

@@ -13,17 +13,11 @@ $thumbnail-icon-border-colour: govuk-colour("mid-grey");
   position: relative;
   @include govuk-font(19);
   @include govuk-clearfix;
-
-  .govuk-details {
-    margin: govuk-spacing(3) 0;
-  }
 }
 
 .gem-c-attachment__thumbnail {
   position: relative;
   width: auto;
-  margin-right: govuk-spacing(5);
-  margin-bottom: govuk-spacing(3);
   padding: $thumbnail-border-width;
   float: left;
 }
@@ -31,20 +25,30 @@ $thumbnail-icon-border-colour: govuk-colour("mid-grey");
 .gem-c-attachment__thumbnail-image {
   display: block;
   width: auto; // for IE8
-  max-width: $thumbnail-width;
-  height: $thumbnail-height;
+  max-width: calc($thumbnail-width / 1.5);
+  height: calc($thumbnail-height / 1.5);
   border: $thumbnail-border-colour; // for IE9 & IE10
   outline: $thumbnail-border-width solid $thumbnail-border-colour;
   background: $thumbnail-background;
   box-shadow: $thumbnail-shadow-width $thumbnail-shadow-colour;
   fill: $thumbnail-icon-border-colour;
   stroke: $thumbnail-icon-border-colour;
+
+  @include govuk-media-query($from: tablet) {
+    max-width: $thumbnail-width;
+    height: $thumbnail-height;
+  }
 }
 
 .gem-c-attachment__details {
-  padding-left: $thumbnail-width + $thumbnail-border-width * 2 + govuk-spacing(5);
+  padding-left: calc(($thumbnail-width + $thumbnail-border-width * 2 + govuk-spacing(5)) / 1.5);
+
+  @include govuk-media-query($from: tablet) {
+    padding-left: $thumbnail-width + $thumbnail-border-width * 2 + govuk-spacing(5);
+  }
 
   .gem-c-details {
+    margin-top: govuk-spacing(3);
     word-break: break-word;
     word-wrap: break-word;
   }
@@ -76,6 +80,18 @@ $thumbnail-icon-border-colour: govuk-colour("mid-grey");
   }
 }
 
+.govspeak,
+.gem-c-govspeak {
+  .gem-c-attachment__title {
+    @include govuk-font($size: 27, $weight: regular);
+    margin: 0 0 govuk-spacing(3) 0;
+  }
+
+  .gem-c-attachment__metadata {
+    margin: 0 0 govuk-spacing(3) 0;
+  }
+}
+
 .gem-c-attachment__metadata--compact {
   margin-bottom: 0;
 }

data/app/assets/stylesheets/govuk_publishing_components/components/_govspeak-html-publication.scss

@@ -25,16 +25,16 @@
       @include govuk-font($size: 27, $weight: bold);
     }
 
-    .stat-headline:first-child {
-      margin-top: govuk-spacing(6);
+    * + h2,
+    * + h3 {
+      padding-top: govuk-spacing(3);
 
       @include govuk-media-query($from: tablet) {
-        margin-top: govuk-spacing(9) + govuk-spacing(4);
+        padding-top: govuk-spacing(9);
       }
     }
 
-    h2,
-    h3 {
+    .stat-headline:first-child {
       margin-top: govuk-spacing(6);
 
       @include govuk-media-query($from: tablet) {
@@ -42,15 +42,6 @@
       }
     }
 
-    h2:first-child,
-    h3:first-child {
-      margin-top: govuk-spacing(4);
-
-      @include govuk-media-query($from: tablet) {
-        margin-top: 0;
-      }
-    }
-
     h3 .number,
     h4 .number,
     h5 .number,

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss

@@ -9,28 +9,14 @@
 
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {
-  // Scope attachment and attachment-link component styles to gem-c-govspeak
-  @import "../attachment-link";
-  @import "../attachment";
-  @import "../details";
-
-  // This block is duplicated from Whitehall as a transitional step, see the
-  // commit message for 2d893c10ee3f2cab27162b9aba38b12379a71d07 before making
-  // changes, original version:
-  // https://github.com/alphagov/whitehall/blob/main/app/assets/stylesheets/frontend/helpers/_attachment.scss
   $thumbnail-width: 99px;
 
   .attachment {
     position: relative;
-    margin: govuk-spacing(6) 0;
-    padding: govuk-spacing(3) 0 0 ($thumbnail-width + govuk-spacing(6));
+    margin: 0 0 govuk-spacing(6) 0;
+    padding: 0 0 0 ($thumbnail-width + govuk-spacing(6));
     @include govuk-clearfix;
 
-    &:first-child {
-      margin-top: 0;
-      padding-top: 0;
-    }
-
     @include govuk-media-query($media-type: print) {
       padding-left: 0;
     }
@@ -64,12 +50,12 @@
 
     .attachment-details {
       h2 {
-        margin: 0;
+        margin: 0 0 govuk-spacing(2) 0;
         @include govuk-font($size: 27);
       }
 
       p {
-        margin: govuk-spacing(2) 0;
+        margin: 0 0 govuk-spacing(2) 0;
       }
 
       .metadata {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_call-to-action.scss

@@ -9,18 +9,9 @@
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {
   .call-to-action {
-    margin: 2em 0;
+    margin: 0 0 govuk-spacing(4) 0;
     background-color: govuk-colour("light-grey");
-    padding: 2em;
-
-    &:first-child {
-      margin-top: 0;
-    }
-
-    p:last-child,
-    ul:last-child,
-    ol:last-child {
-      margin-bottom: 0;
-    }
+    padding: govuk-spacing(6);
+    padding-bottom: govuk-spacing(2);
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_contact.scss

@@ -14,8 +14,7 @@
   .contact {
     border-left: 1px solid govuk-colour("mid-grey");
     padding-left: govuk-spacing(3);
-    margin-bottom: govuk-spacing(6);
-    margin-top: govuk-spacing(6);
+    margin: 0 0 govuk-spacing(6) 0;
   }
 
   .contact {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_example.scss

@@ -9,15 +9,8 @@
 .gem-c-govspeak {
   .example {
     border-left: 10px solid govuk-colour("mid-grey");
-    padding: 1em 0 1em 1em;
-    margin: 2em 0;
-
-    // Remove margin from the last element
-    p:last-child,
-    ul:last-child,
-    ol:last-child {
-      margin-bottom: 0;
-    }
+    padding: govuk-spacing(4) 0 0.1234px govuk-spacing(4); // non-zero padding on bottom keeps margin of last element inside parent, simulating padding
+    margin: 0 0 govuk-spacing(4) 0;
 
     strong {
       display: block;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss

@@ -15,20 +15,11 @@
 .gem-c-govspeak {
   .footnotes {
     border-top: 1px solid govuk-colour("mid-grey");
-    margin-top: govuk-spacing(6);
-    padding-top: govuk-spacing(2);
+    margin: 0 0 govuk-spacing(4) 0;
+    padding-top: govuk-spacing(4);
 
     a {
       overflow-wrap: break-word;
     }
-
-    ol {
-      margin-top: 0;
-      padding-top: 0;
-
-      li p {
-        margin: 10px 0;
-      }
-    }
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_form-download.scss

@@ -1,11 +1,7 @@
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {
   .form-download {
-    padding: .25em 0;
-
-    @include govuk-media-query($until: tablet) {
-      margin: 1em 0 1.5em;
-    }
+    margin: 0 0 govuk-spacing(4) 0;
 
     p {
       padding-right: 3em;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss

@@ -10,7 +10,7 @@ $highlight-answer-color: govuk-colour("white");
     color: $highlight-answer-color;
     text-align: center;
     padding: govuk-spacing(5) govuk-spacing(2) govuk-spacing(4);
-    margin: 0 0 govuk-spacing(2);
+    margin: 0 0 govuk-spacing(4);
 
     p {
       color: $highlight-answer-color;
@@ -29,7 +29,6 @@ $highlight-answer-color: govuk-colour("white");
     }
 
     @include govuk-media-query($until: tablet) {
-      margin: 0 0 govuk-spacing(2);
       @include govuk-font($size: 48);
 
       p {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_images.scss

@@ -16,8 +16,7 @@
     width: 100%;
     clear: both;
     overflow: hidden;
-    padding: govuk-spacing(2) 0 0;
-    margin: 0;
+    margin: 0 0 govuk-spacing(4) 0;
 
     img {
       display: inline;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_information-callout.scss

@@ -10,14 +10,7 @@
 .gem-c-govspeak {
   .info-notice {
     border-left: 10px solid govuk-colour("mid-grey");
-    padding: 1em 0 1em 1em;
-    margin: 2em 0;
-
-    // Remove margin from the last element
-    p:last-child,
-    ul:last-child,
-    ol:last-child {
-      margin-bottom: 0;
-    }
+    padding: govuk-spacing(4) 0 0.1234px govuk-spacing(4); // non-zero padding on bottom keeps margin of last element inside parent, simulating padding
+    margin: 0 0 govuk-spacing(4) 0;
   }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_legislative-list.scss

@@ -9,15 +9,7 @@
 .gem-c-govspeak {
   .legislative-list {
     list-style: none;
-    margin: 5px 0;
-
-    li {
-      margin: 5px 0;
-    }
-
-    p {
-      margin: 20px 0;
-    }
+    margin: 0 0 govuk-spacing(4) 0;
 
     ol {
       margin: govuk-spacing(2) 0 govuk-spacing(2) govuk-spacing(6);

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_media-player.scss

@@ -9,8 +9,7 @@
   position: relative;
   height: 0;
   overflow: hidden;
-  margin-top: govuk-spacing(2);
-  margin-bottom: govuk-spacing(2);
+  margin: 0 0 govuk-spacing(4) 0;
   padding-top: 0;
   padding-left: 0;
   padding-right: 0;

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss

@@ -2,7 +2,7 @@
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {
   .place {
-    margin: 1.5em 0;
+    margin: 0 0 govuk-spacing(4) 0;
     border-bottom: solid 1px govuk-colour("mid-grey");
     padding-bottom: 1.5em;
 
@@ -25,10 +25,6 @@
         margin: .25em 0;
       }
     }
-
-    @include govuk-media-query($until: tablet) {
-      margin: .75em 0;
-    }
   }
 }
 // stylelint-enable max-nesting-depth

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_stat-headline.scss

@@ -8,13 +8,7 @@
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {
   .stat-headline {
-    margin-bottom: govuk-spacing(3);
-    margin-top: govuk-spacing(3);
-
-    @include govuk-media-query($from: tablet) {
-      margin-bottom: govuk-spacing(4);
-      margin-top: govuk-spacing(4);
-    }
+    margin: 0 0 govuk-spacing(4) 0;
 
     p {
       margin: 0;
@@ -23,7 +17,6 @@
 
     em {
       display: block;
-      margin: 3px 0 -5px;
       @include govuk-font($size: 80, $weight: bold);
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_steps.scss

@@ -6,7 +6,7 @@
 
     > li {
       list-style-type: none;
-      margin-left: 0;
+      margin: 0;
       padding: .75em 0 .75em 2.5em;
       position: relative;
 

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_tables.scss

@@ -11,7 +11,7 @@
     border-collapse: collapse;
     border-spacing: 0;
     display: block;
-    margin: govuk-spacing(6) 0;
+    margin: 0 0 govuk-spacing(6) 0;
     overflow-x: auto;
     width: 100%;
     @include govuk-font($size: 19);

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -26,7 +26,6 @@
 
     ul,
     ol {
-      margin-top: 0;
       margin-bottom: 0;
     }
   }

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_warning-callout.scss

@@ -14,8 +14,8 @@
     $icon-size: 35px;
     $icon-spacing: 10px;
 
-    margin: 2em 0;
-    padding-left: calc($icon-size + $icon-spacing);
+    padding: govuk-spacing(3) 0 0 calc($icon-size + $icon-spacing);
+    margin: 0 0 govuk-spacing(6) 0;
     position: relative;
 
     &::before {
@@ -28,11 +28,4 @@
       @include govuk-font($size: 19, $weight: bold);
     }
   }
-
-  // Prevent excessive spacing when placed in a call-to-action block
-  .call-to-action {
-    .help-notice:first-child {
-      margin-top: 0;
-    }
-  }
 }

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss

@@ -1,23 +1,24 @@
 @mixin markdown-typography {
   @include govuk-text-colour;
-
   @include govuk-font($size: 16);
 
   ol,
   ul,
   p {
-    margin-top: govuk-spacing(3);
-    margin-bottom: govuk-spacing(3);
+    margin: 0 0 govuk-spacing(4) 0;
     @include govuk-font($size: 19);
-
-    @include govuk-media-query($from: tablet) {
-      margin-top: govuk-spacing(4);
-      margin-bottom: govuk-spacing(4);
-    }
   }
 
   // Headings
 
+  // put some spacing between any element followed by a heading
+  // has to be padding on the heading otherwise margins would overlap
+
+  * + h2,
+  * + h3 {
+    padding-top: govuk-spacing(4);
+  }
+
   // Markdown is expected to be styled within a document with a H1 title
   // thus H1's are not expected and are discouraged by bare styling
 
@@ -28,45 +29,22 @@
   }
 
   h2 {
-    margin-top: govuk-spacing(6);
-    margin-bottom: govuk-spacing(4);
+    margin: 0 0 govuk-spacing(4) 0;
     @include govuk-font($size: 27, $weight: bold);
-
-    @include govuk-media-query($from: desktop) {
-      margin-top: govuk-spacing(6) * 1.5;
-    }
   }
 
   h3 {
-    margin-top: govuk-spacing(6) + 5px;
-    margin-bottom: 0;
+    margin: 0 0 govuk-spacing(4) 0;
     @include govuk-font($size: 19, $weight: bold);
   }
 
   // H4, H5 and H6 are discouraged and thus styled the same
 
   h4,
-  h5,
-  h6 {
-    margin-top: govuk-spacing(6) + 5px;
-    margin-bottom: 0;
-    @include govuk-font($size: 19, $weight: bold);
-
-    + p {
-      margin-top: 5px;
-    }
-  }
-
   h5,
   h6 {
     margin: 0;
-  }
-
-  h2:first-child,
-  h3:first-child,
-  h4:first-child,
-  p:first-child {
-    margin-top: 0;
+    @include govuk-font($size: 19, $weight: bold);
   }
 
   // Links
@@ -89,15 +67,8 @@
     // utilise the type attribute for the formatting. Browsers default to a
     // style of decimal.
     list-style-position: outside;
-    margin-left: govuk-spacing(4);
+    margin: 0 0 govuk-spacing(4) govuk-spacing(4);
     padding: 0;
-
-    ul,
-    ol {
-      margin-top: 0;
-      margin-bottom: 0;
-      padding: 0;
-    }
   }
 
   ul {
@@ -105,22 +76,11 @@
   }
 
   li {
-    margin: 0 0 5px;
+    margin: 0 0 govuk-spacing(2);
     padding: 0;
 
     p {
-      margin: 0;
-      padding: 0;
-    }
-
-    p + p,
-    p + ul,
-    p + ol,
-    ul + p,
-    ul + ol,
-    ol + p,
-    ol + ul {
-      margin-top: 5px;
+      margin: 0 0 govuk-spacing(2);
     }
   }
 

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -17,6 +17,7 @@ module GovukPublishingComponents
         government-frontend
         govspeak
         govspeak-preview
+        govuk-chat
         govuk-developer-docs
         local-links-manager
         manuals-publisher

data/app/controllers/govuk_publishing_components/component_guide_controller.rb

@@ -1,6 +1,6 @@
 module GovukPublishingComponents
   class ComponentGuideController < GovukPublishingComponents::ApplicationController
-    append_view_path File.join(Rails.root, "app", "views", GovukPublishingComponents::Config.component_directory_name)
+    append_view_path Rails.root.join("app", "views", GovukPublishingComponents::Config.component_directory_name).to_s
 
     MATCH_COMPONENTS = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
 

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -118,7 +118,7 @@ module GovukPublishingComponents
           @gem_style_references << gem_style_references if gem_style_references
         end
       rescue StandardError => e
-        puts e.message
+        Rails.logger.debug e.message
       end
 
       components_found.flatten.uniq.sort

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -290,7 +290,7 @@ module GovukPublishingComponents
       results = []
 
       @applications_data.each do |application|
-        next unless application[:application_found] && !application[:helper_references].blank?
+        next unless application[:application_found] && application[:helper_references].present?
 
         application[:helper_references].each do |key, value|
           location = {

data/app/models/govuk_publishing_components/audit_components.rb

@@ -275,7 +275,7 @@ module GovukPublishingComponents
         next unless File.file?(file)
 
         helpers.each do |helper|
-          next unless File.foreach(file).grep(helper[:match]).present?
+          next if File.foreach(file).grep(helper[:match]).blank?
 
           helper[:used_by] << {
             name: component[:name],

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

@@ -8,6 +8,7 @@
   attributes = []
   url_data_attributes ||= {}
   details_ga4_attributes ||= {}
+  local_assigns[:margin_bottom] ||= 6
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
@@ -126,6 +127,7 @@
       <%= render "govuk_publishing_components/components/details", {
         title: t("components.attachment.request_format_cta"),
         ga4_attributes: details_ga4_attributes,
+        margin_bottom: 0,
       } do %>
         <%= t("components.attachment.request_format_details_html", alternative_format_contact_email: attachment.alternative_format_contact_email) %>
       <% end %>

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

@@ -15,7 +15,8 @@
   end
   text = raw(text)
 
-  cookie_preferences_href ||= "/help/cookies"
+  absolute_links_helper = GovukPublishingComponents::Presenters::AbsoluteLinksHelper.new()
+  cookie_preferences_href ||= absolute_links_helper.make_url_absolute("/help/cookies")
   confirmation_message ||= raw(t("components.cookie_banner.confirmation_message.html",
                                 link: link_to(
                                   t("components.cookie_banner.confirmation_message.link"),

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

@@ -2,13 +2,9 @@
   add_gem_component_stylesheet("button")
   add_gem_component_stylesheet("feedback")
 
-  def utf_encode(element)
-    element.is_a?(String) ? element.encode : element
-  end
-
   email_regex = /[^\s=\/?&]+(?:@|%40)[^\s=\/?&]+/
-  url_without_pii = utf_encode(request.original_url.gsub(email_regex, '[email]'))
-  path_without_pii = utf_encode(request.fullpath.gsub(email_regex, '[email]'))
+  url_without_pii = request.original_url.gsub(email_regex, '[email]').encode
+  path_without_pii = request.fullpath.gsub(email_regex, '[email]').encode
 
   disable_ga4 ||= false
 

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

@@ -1,5 +1,8 @@
 <%
   add_gem_component_stylesheet("govspeak")
+  add_gem_component_stylesheet("attachment-link")
+  add_gem_component_stylesheet("attachment")
+  add_gem_component_stylesheet("details")
 
   inverse ||= false
   local_assigns[:margin_bottom] ||= 0

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

@@ -2,7 +2,6 @@
   add_gem_component_stylesheet("heading")
 
   brand ||= false
-  lang = local_assigns[:lang].presence
   context ||= false
   context_locale ||= false
   context_inside ||= false