From 384900407f2e495e644451b674f10f412d79d5cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:15:49 +0000 Subject: [PATCH 1/3] Bump govuk_publishing_components from 44.3.0 to 44.4.0 Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 44.3.0 to 44.4.0. - [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v44.3.0...v44.4.0) --- updated-dependencies: - dependency-name: govuk_publishing_components dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index af769e4da7..98b524e1fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,6 +98,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) + chartkick (5.1.1) climate_control (1.2.0) coderay (1.1.3) concurrent-ruby (1.3.4) @@ -160,7 +161,8 @@ GEM govuk_personalisation (1.0.0) plek (>= 1.9.0) rails (>= 6, < 8) - govuk_publishing_components (44.3.0) + govuk_publishing_components (44.4.0) + chartkick govuk_app_config govuk_personalisation (>= 0.7.0) kramdown @@ -240,7 +242,7 @@ GEM msgpack (1.7.2) multi_xml (0.7.1) bigdecimal (~> 3.1) - net-imap (0.4.17) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) From d9578ed152da75b3a250e2684489210fb090ca36 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Thu, 17 Oct 2024 14:21:21 +0100 Subject: [PATCH 2/3] Fix Sass compilation warnings --- app/assets/stylesheets/components/_subscribe.scss | 3 +-- app/assets/stylesheets/views/_cookie-settings.scss | 2 +- app/assets/stylesheets/views/_homepage.scss | 13 +++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/components/_subscribe.scss b/app/assets/stylesheets/components/_subscribe.scss index c5c5ca84bf..480003a75f 100644 --- a/app/assets/stylesheets/components/_subscribe.scss +++ b/app/assets/stylesheets/components/_subscribe.scss @@ -7,12 +7,11 @@ } .app-c-subscribe__link { - @include govuk-font($size: 19, $weight: bold); - display: block; background: url("calendars/icon-calendar.png") no-repeat scroll 0 0; min-height: 2.5em; padding: 0 0 0 3em; + @include govuk-font($size: 19, $weight: bold); @include govuk-device-pixel-ratio { background-image: url("calendars/icon-calendar-2x.png"); diff --git a/app/assets/stylesheets/views/_cookie-settings.scss b/app/assets/stylesheets/views/_cookie-settings.scss index dd8e28eeec..76dc1d600b 100644 --- a/app/assets/stylesheets/views/_cookie-settings.scss +++ b/app/assets/stylesheets/views/_cookie-settings.scss @@ -15,9 +15,9 @@ } .cookie-settings__confirmation { - @include govuk-font(19); display: none; margin-top: govuk-spacing(3); + @include govuk-font(19); } .cookie-settings__gov-services { diff --git a/app/assets/stylesheets/views/_homepage.scss b/app/assets/stylesheets/views/_homepage.scss index a4912a046d..7c2da996a2 100644 --- a/app/assets/stylesheets/views/_homepage.scss +++ b/app/assets/stylesheets/views/_homepage.scss @@ -15,8 +15,8 @@ } .homepage__ready-call-to-action { - @include govuk-font(19, $weight: bold); margin-bottom: 0; + @include govuk-font(19, $weight: bold); } .home-services { @@ -24,29 +24,29 @@ } .home-services__heading { - @include govuk-font(19, $weight: bold); margin: 0 0 govuk-spacing(1); + @include govuk-font(19, $weight: bold); } .home-services__para { - @include govuk-font(16); margin: 0 0 govuk-spacing(3); min-height: 40px; + @include govuk-font(16); } .home-info { - @include govuk-font(24); margin: govuk-spacing(2) 0 govuk-spacing(4); + @include govuk-font(24); } .home-more__title { - @include govuk-font(36, $weight: bold); margin: 0 0 govuk-spacing(4); + @include govuk-font(36, $weight: bold); } .home-more__subtitle { - @include govuk-font(24, $weight: bold); margin: 0 0 govuk-spacing(2); + @include govuk-font(24, $weight: bold); } .home-more__list { @@ -184,6 +184,7 @@ .homepage.global-bar-present .homepage-header { @include govuk-responsive-padding(7, "top"); + @media (min-width: 1281px) { // stylelint-disable-line media-feature-range-notation padding-top: govuk-spacing(8); } From ce55bb735b8b153cf023ed38c12f7b9a705a0686 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Thu, 17 Oct 2024 15:20:40 +0100 Subject: [PATCH 3/3] Bump to next version of the gem to fix issue --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 98b524e1fb..4eb1ffefbf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,7 +161,7 @@ GEM govuk_personalisation (1.0.0) plek (>= 1.9.0) rails (>= 6, < 8) - govuk_publishing_components (44.4.0) + govuk_publishing_components (44.4.1) chartkick govuk_app_config govuk_personalisation (>= 0.7.0)