Skip to content

Commit 2f998ff

Browse files
authored
Merge pull request #561 from alphagov/upgrade-minimatch-to-5-1-9
Bump minimatch 5 resolution to 5.1.9
2 parents 27f2afc + c69be28 commit 2f998ff

7 files changed

Lines changed: 548 additions & 535 deletions

File tree

app/assets/stylesheets/components/_array-component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
}
2121
}
2222

23+
// stylelint-disable selector-no-qualifying-type
2324
&--bands {
2425
margin-left: govuk-spacing(0);
2526
margin-right: govuk-spacing(3);
@@ -44,4 +45,5 @@
4445
@extend .gem-c-button--secondary-quiet; // stylelint-disable-line scss/at-extend-no-missing-placeholder
4546
}
4647
}
48+
// stylelint-enable selector-no-qualifying-type
4749
}

app/assets/stylesheets/components/_embedded-objects-blocks-component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@include embed_codes.embed-code-flash;
1616
}
1717

18+
// stylelint-disable selector-no-qualifying-type
1819
&--with-block {
1920
.app-c-embedded-objects-blocks-component__main-summary-card-wrapper {
2021
// stylelint-disable-next-line max-nesting-depth
@@ -24,6 +25,7 @@
2425
}
2526
}
2627
}
28+
// stylelint-enable selector-no-qualifying-type
2729

2830
&--nested {
2931
margin-top: govuk-spacing(6);
@@ -36,6 +38,7 @@
3638
padding-left: govuk-spacing(4);
3739
}
3840

41+
// stylelint-disable selector-no-qualifying-type
3942
&__details-wrapper {
4043
// stylelint-disable-next-line scss/at-extend-no-missing-placeholder
4144
@extend .govuk-summary-card__content;
@@ -50,4 +53,5 @@
5053
padding: 0;
5154
}
5255
}
56+
// stylelint-enable selector-no-qualifying-type
5357
}

app/assets/stylesheets/components/_host-editions-rollup-component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@include govuk-visually-hidden;
1111
}
1212

13+
// stylelint-disable selector-no-qualifying-type
1314
&__rollup-metric {
1415
.gem-c-glance-metric {
1516
border: none;
@@ -30,4 +31,5 @@
3031
}
3132
}
3233
}
34+
// stylelint-enable selector-no-qualifying-type
3335
}

app/assets/stylesheets/components/_reorder-component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
position: relative;
88
}
99

10+
// stylelint-disable selector-no-qualifying-type
1011
&__buttons {
1112
position: absolute;
1213
right: 0;
@@ -17,4 +18,5 @@
1718
margin-right: govuk-spacing(2);
1819
}
1920
}
21+
// stylelint-enable selector-no-qualifying-type
2022
}

app/assets/stylesheets/views/editions/reorder.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
position: relative;
88
}
99

10+
// stylelint-disable selector-no-qualifying-type
1011
&__buttons {
1112
position: absolute;
1213
right: 0;
@@ -17,4 +18,5 @@
1718
margin-right: govuk-spacing(2);
1819
}
1920
}
21+
// stylelint-enable selector-no-qualifying-type
2022
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"picomatch": "^4.0.4",
3939
"prettier": "^3.8.1",
4040
"standard": "^17.1.2",
41-
"stylelint": "^16.26.1",
41+
"stylelint": "^17.6.0",
4242
"stylelint-config-gds": "^2.0.0",
4343
"tinyglobby": "^0.2.15",
4444
"ts-declaration-location": "^1.0.7"

yarn.lock

Lines changed: 535 additions & 534 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)