From 643410dd70b464cf5a791dbc7775e2d174341dd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 17:46:11 +0000 Subject: [PATCH 1/2] Bump stylelint from 16.4.0 to 16.5.0 Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.4.0 to 16.5.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.4.0...16.5.0) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ef5d63ec2..dcccccd8f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "standardx": "^7.0.0", - "stylelint": "^16.4.0", + "stylelint": "^16.5.0", "stylelint-config-gds": "^2.0.0" }, "packageManager": "yarn@3.5.0" diff --git a/yarn.lock b/yarn.lock index 7857db76e..73de6dd5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1343,7 +1343,7 @@ __metadata: jasmine-browser-runner: ^2.4.0 jasmine-core: ^5.1.2 standardx: ^7.0.0 - stylelint: ^16.4.0 + stylelint: ^16.5.0 stylelint-config-gds: ^2.0.0 languageName: unknown linkType: soft @@ -3402,9 +3402,9 @@ __metadata: languageName: node linkType: hard -"stylelint@npm:^16.4.0": - version: 16.4.0 - resolution: "stylelint@npm:16.4.0" +"stylelint@npm:^16.5.0": + version: 16.5.0 + resolution: "stylelint@npm:16.5.0" dependencies: "@csstools/css-parser-algorithms": ^2.6.1 "@csstools/css-tokenizer": ^2.2.4 @@ -3447,7 +3447,7 @@ __metadata: write-file-atomic: ^5.0.1 bin: stylelint: bin/stylelint.mjs - checksum: 0363d1eaa1663fa9f7b7b59a8a3cae527ed7cb9b61647da67770f989472595c9d368b8e72aef9dfc5e2ad856f1cbcf19118c4340c693a4fcddab3ab202677ae6 + checksum: 65271934af21e37117cc6586ebb46cb2629d5c247f05a0b39effca08bf6c85c1a4f489e5b04519e301e65d2f1996a395bc34d3b8ccbb4e7125d820381662ddc7 languageName: node linkType: hard From 3601d0f1bb90d485195443dc674d93d7604ec2e5 Mon Sep 17 00:00:00 2001 From: Rebecca Pearce <17481621+beccapearce@users.noreply.github.com> Date: Tue, 7 May 2024 14:12:52 +0100 Subject: [PATCH 2/2] Appease the linter Run `yarn run stylelint app/assets/stylesheets/ --fix` to fix 9 shorthand-property-no-redundant-values linting failures --- app/assets/stylesheets/views/_homepage.scss | 12 ++++++------ .../stylesheets/views/_homepage_more_on_govuk.scss | 4 ++-- app/assets/stylesheets/views/_local-transaction.scss | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/views/_homepage.scss b/app/assets/stylesheets/views/_homepage.scss index e5567358a..7d19e5517 100644 --- a/app/assets/stylesheets/views/_homepage.scss +++ b/app/assets/stylesheets/views/_homepage.scss @@ -3,7 +3,7 @@ @import "govuk_publishing_components/components/mixins/grid-helper"; .homepage__ready-container { - margin: govuk-spacing(6) 0 govuk-spacing(7) 0; + margin: govuk-spacing(6) 0 govuk-spacing(7); @include govuk-media-query($from: desktop) { margin-bottom: govuk-spacing(3); @@ -25,12 +25,12 @@ .home-services__heading { @include govuk-font(19, $weight: bold); - margin: 0 0 govuk-spacing(1) 0; + margin: 0 0 govuk-spacing(1); } .home-services__para { @include govuk-font(16); - margin: 0 0 govuk-spacing(3) 0; + margin: 0 0 govuk-spacing(3); min-height: 40px; } @@ -41,12 +41,12 @@ .home-more__title { @include govuk-font(36, $weight: bold); - margin: 0 0 govuk-spacing(4) 0; + margin: 0 0 govuk-spacing(4); } .home-more__subtitle { @include govuk-font(24, $weight: bold); - margin: 0 0 govuk-spacing(2) 0; + margin: 0 0 govuk-spacing(2); } .home-more__list { @@ -62,7 +62,7 @@ .chevron-card { border-top: 1px solid $govuk-border-colour; margin: 0 govuk-spacing(3); - padding: govuk-spacing(1) 0 govuk-spacing(4) 0; + padding: govuk-spacing(1) 0 govuk-spacing(4); &:first-child { border-top: none; diff --git a/app/assets/stylesheets/views/_homepage_more_on_govuk.scss b/app/assets/stylesheets/views/_homepage_more_on_govuk.scss index dc9db1187..2141ce675 100644 --- a/app/assets/stylesheets/views/_homepage_more_on_govuk.scss +++ b/app/assets/stylesheets/views/_homepage_more_on_govuk.scss @@ -2,12 +2,12 @@ .homepage-most-active-list { list-style: none; - margin: 0 0 govuk-spacing(9) 0; + margin: 0 0 govuk-spacing(9); padding: 0; } .homepage-most-active-list__item { - margin: 0 0 govuk-spacing(4) 0; + margin: 0 0 govuk-spacing(4); @include govuk-font($size: 19, $weight: bold); &:last-of-type { diff --git a/app/assets/stylesheets/views/_local-transaction.scss b/app/assets/stylesheets/views/_local-transaction.scss index 11d11f521..1f3cd80ff 100644 --- a/app/assets/stylesheets/views/_local-transaction.scss +++ b/app/assets/stylesheets/views/_local-transaction.scss @@ -9,5 +9,5 @@ } .search-again { - margin: govuk-spacing(7) 0 govuk-spacing(3) 0; + margin: govuk-spacing(7) 0 govuk-spacing(3); }