govuk_publishing_components 35.3.2 → 35.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ace2c61b08a0641bc1234bf1e1b34e3e2e184ad07f554bde39c60280e58dd5
-  data.tar.gz: fb3dbf387e8e668bf81b2b13c8c73a5152d3d4c2e570f7b2743e96f424b70680
+  metadata.gz: 0a65b99aa87692b87b842da1d33c81240ab4632d1ee1e5344d28b368a8a4eddf
+  data.tar.gz: cc9f77e7bae24a5a43a8ba7c49be27e3811306b90ad4c82bc9df33b1bffdc08c
 SHA512:
-  metadata.gz: da81d3abeeb7d15ea0c74d1f428df7a9d7856ce078a50e63c8e66da7e244dea937f6600a457592c5ebafc1615dd623a8cc81e578e2a8eae4de97e7fa8fb7b779
-  data.tar.gz: c2dcc61e03d0999871fca19f559833717892cb67ab16ed198eb8266fe06fe0d58a6465d65eae4e62c3aa84865732216ffeb8e224b2cb9f84fb8a2ae5ef089491
+  metadata.gz: 95655b6b6deff43a8665714a161b925059d60da25f1d63a39004a5b460dcaa860dbc9eeffd02e2f086b09cb810e61e9dde6eb30db91f68f4e356d88cf0d8ae48
+  data.tar.gz: bc259ebde3123faf6e41cd55cdec44ec13d98c30627ac40fd4336b7ccc06349a672712380d120d1194e3b0c7d086c16f947c8c3c636134dbdab2e0cb374ce8af

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -76,7 +76,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   CookieBanner.prototype.setCookieConsent = function () {
     if (this.$acceptCookiesButton.getAttribute('data-cookie-types') === 'all') {
-      this.$module.querySelector('.gem-c-cookie-banner__confirmation-message__accepted').hidden = false
+      this.$module.querySelector('.gem-c-cookie-banner__confirmation-message--accepted').hidden = false
     }
     window.GOVUK.approveAllCookieTypes()
     this.$module.showConfirmationMessage()
@@ -92,7 +92,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   CookieBanner.prototype.rejectCookieConsent = function () {
-    this.$module.querySelector('.gem-c-cookie-banner__confirmation-message__rejected').hidden = false
+    this.$module.querySelector('.gem-c-cookie-banner__confirmation-message--rejected').hidden = false
     this.$module.showConfirmationMessage()
     this.$module.cookieBannerConfirmationMessage.focus()
     window.GOVUK.cookie('cookies_preferences_set', 'true', { days: 365 })
@@ -100,11 +100,17 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   }
 
   CookieBanner.prototype.showConfirmationMessage = function () {
-    this.$cookieBannerMainContent = document.querySelector('.js-banner-wrapper')
+    this.$cookieBannerHeader = document.querySelector('.govuk-cookie-banner__heading')
+    this.$cookieBannerHeader.hidden = true
 
+    this.$cookieBannerMainContent = document.querySelector('.gem-c-cookie-banner__content')
     this.$cookieBannerMainContent.hidden = true
-    this.$module.cookieBannerConfirmationMessage.style.display = 'block'
-    this.$module.cookieBannerConfirmationMessage.hidden = false
+
+    this.$cookieBannerConfirmationButtons = document.querySelector('.js-confirmation-buttons')
+    this.$cookieBannerConfirmationButtons.hidden = true
+
+    this.$cookieBannerHideButton = document.querySelector('.js-hide-button')
+    this.$cookieBannerHideButton.hidden = false
   }
 
   CookieBanner.prototype.isInCookiesPage = function () {

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

@@ -1,6 +1,13 @@
 @import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/cookie-banner/cookie-banner";
-$govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
+
+.gem-c-cookie-banner .govuk-button-group[hidden] {
+  display: none;
+}
+
+.govuk-cookie-banner .govuk-cookie-banner__heading[hidden] {
+  display: none;
+}
 
 .js-enabled {
   .gem-c-cookie-banner {
@@ -8,20 +15,12 @@ $govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
   }
 }
 
-.gem-c-cookie-banner {
-  background-color: $govuk-cookie-banner-background;
-}
-
 // can't be used without js so implement there
 .gem-c-cookie-banner .gem-c-button {
   display: none;
 }
 
 .gem-c-cookie-banner__confirmation {
-  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 {
@@ -29,56 +28,6 @@ $govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
   }
 }
 
-.gem-c-cookie-banner__confirmation-message,
-.gem-c-cookie-banner__hide-button {
-  display: block;
-
-  @include govuk-media-query($from: desktop) {
-    display: inline-block;
-  }
-}
-
-.gem-c-cookie-banner__confirmation-message {
-  margin-right: govuk-spacing(4);
-
-  @include govuk-media-query($from: desktop) {
-    max-width: 90%;
-    margin-bottom: 0;
-  }
-}
-
-// Override style from design system so we can have consistent
-// padding on the the banner and the confirmation
-
-.govuk-cookie-banner {
-  padding-top: 0;
-}
-
-// Override the styles from govuk_template
-// stylelint-disable selector-max-id
-.gem-c-cookie-banner#global-cookie-message {
-  background-color: $govuk-cookie-banner-background;
-  padding: govuk-spacing(3) 0 0 0;
-  box-sizing: border-box;
-
-  .gem-c-cookie-banner__message,
-  .gem-c-cookie-banner__buttons,
-  .gem-c-cookie-banner__confirmation,
-  .gem-c-cookie-banner__confirmation-message {
-    @include govuk-font($size: 19);
-  }
-
-  p {
-    @include govuk-font($size: 19);
-    margin: 0 0 govuk-spacing(2) 0;
-  }
-
-  .gem-c-cookie-banner__message,
-  .gem-c-cookie-banner__confirmation {
-    margin-bottom: - govuk-spacing(2);
-  }
-}
-
 @include govuk-media-query($media-type: print) {
   .gem-c-cookie-banner {
     display: none !important; // stylelint-disable-line declaration-no-important

data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_brand-colours.scss

@@ -96,3 +96,27 @@
     border-color: #045f71;
   }
 }
+
+// This change should be removed after relevant govuk-frontend release
+
+.brand--department-for-business-and-trade {
+  .brand__color {
+    color: #cf102d;
+
+    &:link,
+    &:visited,
+    &:active {
+      color: #cf102d;
+    }
+
+    &:hover,
+    &:focus {
+      color: $govuk-focus-text-colour;
+    }
+  }
+
+  &.brand__border-color,
+  .brand__border-color {
+    border-color: #cf102d;
+  }
+}

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

@@ -28,71 +28,63 @@
                                   },
                                 )))
   services_cookies ||= nil
-  css_classes = %w(gem-c-cookie-banner govuk-clearfix)
+  css_classes = %w(gem-c-cookie-banner govuk-clearfix govuk-cookie-banner js-banner-wrapper)
   css_classes << "gem-c-cookie-banner--services" if services_cookies
 %>
+
 <div id="<%= id %>" class="<%= css_classes.join(' ') %>" data-module="cookie-banner" data-nosnippet role="region" aria-label="<%= title %>">
-  <div class="govuk-cookie-banner js-banner-wrapper">
-    <div class="gem-c-cookie-banner__message govuk-cookie-banner__message govuk-width-container">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <h2 class="govuk-cookie-banner__heading govuk-heading-m"><%= title %></h2>
-          <div class="govuk-cookie-banner__content">
-            <%= text %>
-          </div>
+  <div class="govuk-cookie-banner__message govuk-width-container">
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        <h2 class="govuk-cookie-banner__heading govuk-heading-m"><%= title %></h2>
+        <div tabindex="-1" class="govuk-cookie-banner__content gem-c-cookie-banner__confirmation">
+          <span class="gem-c-cookie-banner__content"><%= text %></span>
+          <p class="gem-c-cookie-banner__confirmation-message--accepted govuk-body" hidden><%= t("components.cookie_banner.confirmation_message.accepted") %>. <span class="gem-c-cookie-banner__confirmation-message"><%= confirmation_message %></span></p>
+          <p class="gem-c-cookie-banner__confirmation-message--rejected govuk-body" hidden><%= t("components.cookie_banner.confirmation_message.rejected") %>. <span class="gem-c-cookie-banner__confirmation-message"><%= confirmation_message %></span></p>
         </div>
       </div>
+    </div>
+    <div class="js-confirmation-buttons govuk-button-group">
       <% if services_cookies %>
-          <div class="govuk-button-group">
-            <%= render "govuk_publishing_components/components/button", {
-              name: "cookies",
-              text: services_cookies.dig(:yes, :text) || "Yes",
-              data_attributes: { module: "gem-track-click", "accept-cookies": "true", }.merge(services_cookies.dig(:yes, :data_attributes) || {})
-            } %>
-            <%= render "govuk_publishing_components/components/button", {
-              name: "cookies",
-              text: services_cookies.dig(:no, :text) || "No",
-              data_attributes: { module: "gem-track-click", "reject-cookies": "true", }.merge(services_cookies.dig(:no, :data_attributes) || {})
-            } %>
-            <% if services_cookies[:cookie_preferences] %>
-              <%= link_to services_cookies.dig(:cookie_preferences, :text), services_cookies.dig(:cookie_preferences, :href), class: "govuk-link" %>
-            <% end %>
-          </div>
-        <% else %>
-          <div class="govuk-button-group">
-            <%= render "govuk_publishing_components/components/button", {
-                name: "cookies",
-                text: t("components.cookie_banner.buttons.accept_cookies"),
-                data_attributes: {
-                  module: "gem-track-click",
-                  "accept-cookies": "true",
-                  "track-category": "cookieBanner",
-                  "track-action": "Cookie banner accepted",
-                  "cookie-types": "all",
-                }
-            } %>
-            <%= render "govuk_publishing_components/components/button", {
-                name: "cookies",
-                text: t("components.cookie_banner.buttons.reject_cookies"),
-                data_attributes: {
-                  module: "gem-track-click",
-                  "reject-cookies": "true",
-                  "track-category": "cookieBanner",
-                  "track-action": "Cookie banner rejected",
-                }
-            } %>
-            <a class="govuk-link" href="<%= cookie_preferences_href %>"><%= t("components.cookie_banner.buttons.view_cookies") %></a>
-          </div>
+        <%= render "govuk_publishing_components/components/button", {
+          name: "cookies",
+          text: services_cookies.dig(:yes, :text) || "Yes",
+          data_attributes: { module: "gem-track-click", "accept-cookies": "true", }.merge(services_cookies.dig(:yes, :data_attributes) || {})
+        } %>
+        <%= render "govuk_publishing_components/components/button", {
+          name: "cookies",
+          text: services_cookies.dig(:no, :text) || "No",
+          data_attributes: { module: "gem-track-click", "reject-cookies": "true", }.merge(services_cookies.dig(:no, :data_attributes) || {})
+        } %>
+        <% if services_cookies[:cookie_preferences] %>
+          <%= link_to services_cookies.dig(:cookie_preferences, :text), services_cookies.dig(:cookie_preferences, :href), class: "govuk-link" %>
         <% end %>
+      <% else %>
+        <%= render "govuk_publishing_components/components/button", {
+            name: "cookies",
+            text: t("components.cookie_banner.buttons.accept_cookies"),
+            data_attributes: {
+              module: "gem-track-click",
+              "accept-cookies": "true",
+              "track-category": "cookieBanner",
+              "track-action": "Cookie banner accepted",
+              "cookie-types": "all",
+            }
+        } %>
+        <%= render "govuk_publishing_components/components/button", {
+            name: "cookies",
+            text: t("components.cookie_banner.buttons.reject_cookies"),
+            data_attributes: {
+              module: "gem-track-click",
+              "reject-cookies": "true",
+              "track-category": "cookieBanner",
+              "track-action": "Cookie banner rejected",
+            }
+        } %>
+        <a class="govuk-link" href="<%= cookie_preferences_href %>"><%= t("components.cookie_banner.buttons.view_cookies") %></a>
+      <% end %>
     </div>
-  </div>
-  <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1" hidden>
-    <p class="gem-c-cookie-banner__confirmation-message" role="alert">
-      <span class="gem-c-cookie-banner__confirmation-message__accepted" hidden><%= t("components.cookie_banner.confirmation_message.accepted") %>. </span>
-      <span class="gem-c-cookie-banner__confirmation-message__rejected" hidden><%= t("components.cookie_banner.confirmation_message.rejected") %>. </span>
-      <%= confirmation_message %>
-    </p>
-    <div class="govuk-button-group">
+    <div hidden class="js-hide-button govuk-button-group">
       <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="gem-track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner"><%= t("components.cookie_banner.hide") %></button>
     </div>
   </div>

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

@@ -270,7 +270,7 @@
                 class="gem-c-layout-super-navigation-header__search-form"
                 id="search"
                 data-module="ga4-form-tracker"
-                data-ga4-form='{ "event_name": "search", "type": "header menu bar", "section": "Search GOV.UK", "action": "Search", "url": "/search/all" }'
+                data-ga4-form='{ "event_name": "search", "type": "header menu bar", "section": "Search GOV.UK", "action": "search", "url": "/search/all" }'
                 data-ga4-form-include-text
                 action="/search"
                 method="get"

data/config/locales/cy.yml

@@ -176,7 +176,7 @@ cy:
       label: Chwilio ar GOV.UK
       search_button: Chwilio
     share_links:
-      all_opens_in_new_tab:
+      all_opens_in_new_tab: Bydd rhannu yn agor y dudalen hon mewn tab newydd
       opens_in_new_tab:
     show_password:
       announce_hide: Mae eich cyfrinair wedi'i guddio

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "35.3.2".freeze
+  VERSION = "35.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 35.3.2
+  version: 35.3.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config