From 61b8dc2fd6011711fc1a6c2212195eba938dd4b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:51:38 +0000 Subject: [PATCH 1/2] Bump stylelint-config-recess-order from 5.1.1 to 6.0.0 Bumps [stylelint-config-recess-order](https://github.com/stormwarning/stylelint-config-recess-order) from 5.1.1 to 6.0.0. - [Release notes](https://github.com/stormwarning/stylelint-config-recess-order/releases) - [Changelog](https://github.com/stormwarning/stylelint-config-recess-order/blob/main/CHANGELOG.md) - [Commits](https://github.com/stormwarning/stylelint-config-recess-order/compare/v5.1.1...v6.0.0) --- updated-dependencies: - dependency-name: stylelint-config-recess-order dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5dfe789263e..f4c51139671 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "standard": "^17.1.2", "stylelint": "^16.13.2", "stylelint-config-gds": "^2.0.0", - "stylelint-config-recess-order": "^5.1.1", + "stylelint-config-recess-order": "^6.0.0", "stylelint-order": "^6.0.4" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index 5ba98e0eb9f..06d9799ec1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9039,10 +9039,10 @@ stylelint-config-gds@^2.0.0: stylelint-config-standard "^36.0.0" stylelint-config-standard-scss "^13.0.0" -stylelint-config-recess-order@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/stylelint-config-recess-order/-/stylelint-config-recess-order-5.1.1.tgz#befbf671343a6a04f70791fd3075b275fe33f5ff" - integrity sha512-eDAHWVBelzDbMbdMj15pSw0Ycykv5eLeriJdbGCp0zd44yvhgZLI+wyVHegzXp5NrstxTPSxl0fuOVKdMm0XLA== +stylelint-config-recess-order@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recess-order/-/stylelint-config-recess-order-6.0.0.tgz#5954333b0fa992a4218c6636c66186983a1051d9" + integrity sha512-1KqrttqpIrCYFAVQ1/bbgXo7EvvcjmkxxmnzVr+U66Xr2OlrNZqQ5+44Tmct6grCWY6wGTIBh2tSANqcmwIM2g== dependencies: stylelint-order "^6.0.4" From cc451f97501ab210ef54ffda34863fa60f0d41c0 Mon Sep 17 00:00:00 2001 From: Lori Bailey <44073106+elceebee@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:31:03 +0000 Subject: [PATCH 2/2] Apply new css linting styles --- app/frontend/styles/_add_another.scss | 7 ++++++- app/frontend/styles/_application-item.scss | 1 + app/frontend/styles/_card.scss | 2 ++ app/frontend/styles/_contents-list.scss | 2 ++ app/frontend/styles/_feedback.scss | 4 +++- app/frontend/styles/_flex-grid.scss | 4 ++-- app/frontend/styles/_link_button.scss | 1 + app/frontend/styles/_primary-navigation.scss | 5 ++++- app/frontend/styles/_status-indicator.scss | 1 + app/frontend/styles/_summary-card.scss | 1 + app/frontend/styles/_syntax-highlighting.scss | 2 ++ app/frontend/styles/_tab-navigation.scss | 3 +++ app/frontend/styles/application-support.scss | 1 + .../styles/components/_checkbox_search_filter.scss | 1 + app/frontend/styles/components/_paginated_filter.scss | 6 +++++- app/frontend/styles/components/_tabs.scss | 3 +++ app/frontend/styles/provider/_interview_card.scss | 2 ++ .../styles/provider/_recruitment_performance_report.scss | 1 + app/frontend/styles/publications/_itt_data_table.scss | 4 +++- app/frontend/styles/publications/_metadata.scss | 5 +++-- app/frontend/styles/publications/_sortable_table.scss | 7 ++++++- app/frontend/styles/support/_app-count.scss | 6 +++++- app/frontend/styles/support/_checkboxes-scroll.scss | 2 ++ app/frontend/styles/support/_sort.scss | 4 +++- 24 files changed, 63 insertions(+), 12 deletions(-) diff --git a/app/frontend/styles/_add_another.scss b/app/frontend/styles/_add_another.scss index 0982c43239c..8b3dd2db0b4 100644 --- a/app/frontend/styles/_add_another.scss +++ b/app/frontend/styles/_add_another.scss @@ -17,7 +17,9 @@ &__title { float: left; + width: 100%; + padding: 4px 0; } @@ -25,6 +27,7 @@ padding: 0; color: govuk-colour("blue"); + text-decoration: underline; background: none; @@ -32,6 +35,7 @@ &:hover { color: $govuk-link-hover-colour; + text-decoration: underline; background: none; @@ -52,8 +56,9 @@ .app-add-condition__heading:focus { color: $govuk-focus-text-colour; - background-color: $govuk-focus-colour; outline: none; + + background-color: $govuk-focus-colour; box-shadow: 0 -2px $govuk-focus-colour, 0 4px $govuk-focus-text-colour; diff --git a/app/frontend/styles/_application-item.scss b/app/frontend/styles/_application-item.scss index f57879ac42f..ade6cf9eebe 100644 --- a/app/frontend/styles/_application-item.scss +++ b/app/frontend/styles/_application-item.scss @@ -9,6 +9,7 @@ @include govuk-link-common; @include govuk-link-style-default; color: $govuk-link-colour; + text-wrap: balance; } diff --git a/app/frontend/styles/_card.scss b/app/frontend/styles/_card.scss index 90fe76f3496..f9b8462aa02 100644 --- a/app/frontend/styles/_card.scss +++ b/app/frontend/styles/_card.scss @@ -38,6 +38,7 @@ .app-card__link { color: inherit; + text-decoration: none; > * { @@ -64,6 +65,7 @@ &:focus::before { outline: $govuk-focus-width solid $govuk-focus-colour; + box-shadow: inset 0 0 0 4px govuk-colour("black"); } diff --git a/app/frontend/styles/_contents-list.scss b/app/frontend/styles/_contents-list.scss index ef34debc59b..cc692fccfb6 100644 --- a/app/frontend/styles/_contents-list.scss +++ b/app/frontend/styles/_contents-list.scss @@ -57,6 +57,7 @@ padding-top: govuk-spacing(2); line-height: 1.3; + list-style-type: none; } @@ -72,6 +73,7 @@ left: 0; width: govuk-spacing(4); + overflow: hidden; content: "—"; diff --git a/app/frontend/styles/_feedback.scss b/app/frontend/styles/_feedback.scss index da186ec9420..604825e1b55 100644 --- a/app/frontend/styles/_feedback.scss +++ b/app/frontend/styles/_feedback.scss @@ -7,10 +7,12 @@ align-items: center; min-height: 80px; + padding: govuk-spacing(2) govuk-spacing(5); - background-color: govuk-colour("light-grey"); outline: 0; + + background-color: govuk-colour("light-grey"); } .app-feedback-helpful { diff --git a/app/frontend/styles/_flex-grid.scss b/app/frontend/styles/_flex-grid.scss index 84c4912520d..249d7610260 100644 --- a/app/frontend/styles/_flex-grid.scss +++ b/app/frontend/styles/_flex-grid.scss @@ -12,9 +12,9 @@ @each $width in map-keys($govuk-grid-widths) { .govuk-grid-column-#{$width} { - display: flex; - float: none; + + display: flex; } .govuk-grid-column-#{$width} > * { diff --git a/app/frontend/styles/_link_button.scss b/app/frontend/styles/_link_button.scss index 06e0f236df4..1ffc81b44dc 100644 --- a/app/frontend/styles/_link_button.scss +++ b/app/frontend/styles/_link_button.scss @@ -2,6 +2,7 @@ padding: 0; font-size: inherit; + color: $govuk-link-colour; cursor: pointer; diff --git a/app/frontend/styles/_primary-navigation.scss b/app/frontend/styles/_primary-navigation.scss index 7dd2b20712d..c0f0c6dee68 100644 --- a/app/frontend/styles/_primary-navigation.scss +++ b/app/frontend/styles/_primary-navigation.scss @@ -29,6 +29,7 @@ .app-primary-navigation__item { @include govuk-font($size: 19); float: left; + margin-top: 0; margin-right: govuk-spacing(3); @@ -56,13 +57,15 @@ padding-bottom: govuk-spacing(3); font-weight: bold; + text-decoration: none; &:focus { color: $govuk-focus-text-colour; - background-color: $govuk-focus-colour; outline: $govuk-focus-width solid transparent; + + background-color: $govuk-focus-colour; box-shadow: inset 0 -5px 0 0 $govuk-focus-text-colour; } diff --git a/app/frontend/styles/_status-indicator.scss b/app/frontend/styles/_status-indicator.scss index 129b278d03f..e9a20eab040 100644 --- a/app/frontend/styles/_status-indicator.scss +++ b/app/frontend/styles/_status-indicator.scss @@ -6,6 +6,7 @@ width: govuk-spacing(1); height: govuk-spacing(1); + margin-right: govuk-spacing(1); border: 4px currentColor solid; diff --git a/app/frontend/styles/_summary-card.scss b/app/frontend/styles/_summary-card.scss index 5c92c28714e..bff5dca951f 100644 --- a/app/frontend/styles/_summary-card.scss +++ b/app/frontend/styles/_summary-card.scss @@ -48,6 +48,7 @@ .app-summary-card__actions-list { width: 100%; + padding: 0; margin: 0; } diff --git a/app/frontend/styles/_syntax-highlighting.scss b/app/frontend/styles/_syntax-highlighting.scss index 47450146fb6..e6de8a974c0 100644 --- a/app/frontend/styles/_syntax-highlighting.scss +++ b/app/frontend/styles/_syntax-highlighting.scss @@ -30,7 +30,9 @@ $code-delete-bg: #fadddd; font-family: Monaco, Consolas, "Lucida Console", monospace; font-size: 15px; + color: $code-05; + -ms-word-break: break-all; word-break: break-all; word-break: break-word; diff --git a/app/frontend/styles/_tab-navigation.scss b/app/frontend/styles/_tab-navigation.scss index eb426c413e3..d967b09381b 100644 --- a/app/frontend/styles/_tab-navigation.scss +++ b/app/frontend/styles/_tab-navigation.scss @@ -7,6 +7,7 @@ margin: 0; font-size: 0; // Removes white space when using inline-block on child element. + list-style: none; @include govuk-media-query($from: 375px) { @@ -50,6 +51,7 @@ padding-left: govuk-spacing(3); font-weight: bold; + text-decoration: none; @include govuk-media-query($from: 375px) { @@ -96,6 +98,7 @@ position: relative; color: $govuk-link-active-colour; + text-decoration: none; &::before { diff --git a/app/frontend/styles/application-support.scss b/app/frontend/styles/application-support.scss index d29aa6883f0..395c6f7e37f 100644 --- a/app/frontend/styles/application-support.scss +++ b/app/frontend/styles/application-support.scss @@ -8,6 +8,7 @@ margin: 0; font-weight: normal; + color: $govuk-secondary-text-colour; } diff --git a/app/frontend/styles/components/_checkbox_search_filter.scss b/app/frontend/styles/components/_checkbox_search_filter.scss index 4fb4cb09b51..baf9b25fb2c 100644 --- a/app/frontend/styles/components/_checkbox_search_filter.scss +++ b/app/frontend/styles/components/_checkbox_search_filter.scss @@ -30,6 +30,7 @@ position: relative; max-height: 200px; + overflow-x: hidden; overflow-y: auto; diff --git a/app/frontend/styles/components/_paginated_filter.scss b/app/frontend/styles/components/_paginated_filter.scss index ea274cfc6ff..4a09cd129f7 100644 --- a/app/frontend/styles/components/_paginated_filter.scss +++ b/app/frontend/styles/components/_paginated_filter.scss @@ -23,6 +23,7 @@ .filter-toggle-button { float: right; + margin-bottom: govuk-spacing(1); @include govuk-media-query($from: desktop) { display: none; @@ -36,6 +37,7 @@ @media (min-width: 48.0625em) { .moj-filter-layout__filter { max-width: 310px; + margin-right: govuk-spacing(6); } } @@ -106,8 +108,9 @@ .moj-filter__tag:focus { text-decoration: none; - background-color: govuk-colour("yellow"); outline: 3px solid transparent; + + background-color: govuk-colour("yellow"); box-shadow: 0 4px govuk-colour("black"); } @@ -141,6 +144,7 @@ display: inline-block; width: auto; + margin-top: 0; margin-bottom: 0; margin-left: 10px; diff --git a/app/frontend/styles/components/_tabs.scss b/app/frontend/styles/components/_tabs.scss index dca2d80a1e4..1efe132c00e 100644 --- a/app/frontend/styles/components/_tabs.scss +++ b/app/frontend/styles/components/_tabs.scss @@ -24,6 +24,7 @@ padding: 0; font-size: 0; + list-style: none; } @@ -35,6 +36,7 @@ margin-bottom: 0; font-size: 1rem; + line-height: 1.25; } @@ -48,6 +50,7 @@ padding-bottom: govuk-spacing(3); font-weight: bold; + text-decoration: none; &:focus { diff --git a/app/frontend/styles/provider/_interview_card.scss b/app/frontend/styles/provider/_interview_card.scss index 4273b9a886d..79eb2ea38d8 100644 --- a/app/frontend/styles/provider/_interview_card.scss +++ b/app/frontend/styles/provider/_interview_card.scss @@ -18,6 +18,7 @@ box-sizing: border-box; width: 15%; + padding-right: govuk-spacing(2); } @@ -25,6 +26,7 @@ box-sizing: border-box; width: 40%; + padding-right: govuk-spacing(2); } diff --git a/app/frontend/styles/provider/_recruitment_performance_report.scss b/app/frontend/styles/provider/_recruitment_performance_report.scss index d72f10d5299..a1cd5520308 100644 --- a/app/frontend/styles/provider/_recruitment_performance_report.scss +++ b/app/frontend/styles/provider/_recruitment_performance_report.scss @@ -1,6 +1,7 @@ .recruitment-performance-report-table { &__wrapper { margin-bottom: govuk-spacing(4); + overflow-x: auto; } diff --git a/app/frontend/styles/publications/_itt_data_table.scss b/app/frontend/styles/publications/_itt_data_table.scss index 34e6648f084..1900120db83 100644 --- a/app/frontend/styles/publications/_itt_data_table.scss +++ b/app/frontend/styles/publications/_itt_data_table.scss @@ -20,6 +20,7 @@ padding-bottom: 2px; color: $govuk-link-colour; + text-decoration: underline; cursor: pointer; @@ -39,13 +40,14 @@ // Make the ::before element take up the same amount of space the element would if it were bold. &__list-item a::before { display: block; + visibility: hidden; height: 0; + overflow: hidden; font-weight: bold; - visibility: hidden; content: attr(title); } // end hack diff --git a/app/frontend/styles/publications/_metadata.scss b/app/frontend/styles/publications/_metadata.scss index 97623dee116..14da2bc8ea5 100644 --- a/app/frontend/styles/publications/_metadata.scss +++ b/app/frontend/styles/publications/_metadata.scss @@ -64,12 +64,13 @@ margin-top: 0.5em; @include govuk-media-query($from: tablet) { + float: left; + clear: left; + box-sizing: border-box; - float: left; padding-right: govuk-spacing(1); margin-top: 0; - clear: left; } } diff --git a/app/frontend/styles/publications/_sortable_table.scss b/app/frontend/styles/publications/_sortable_table.scss index 5397c06ed04..c45022fdebc 100644 --- a/app/frontend/styles/publications/_sortable_table.scss +++ b/app/frontend/styles/publications/_sortable_table.scss @@ -8,7 +8,9 @@ font-family: inherit; font-size: 1em; font-weight: inherit; + color: #005ea5; + text-align: inherit; cursor: pointer; @@ -74,10 +76,13 @@ width: 1px; height: 1px; + padding: 0; margin: -1px; + overflow: hidden; - clip: rect(0 0 0 0); border: 0; + + clip: rect(0 0 0 0); } diff --git a/app/frontend/styles/support/_app-count.scss b/app/frontend/styles/support/_app-count.scss index d3f3136713b..c6228eea273 100644 --- a/app/frontend/styles/support/_app-count.scss +++ b/app/frontend/styles/support/_app-count.scss @@ -5,15 +5,19 @@ // lozenge shape when there are 3 digits or more. min-width: 24px; height: 28px; + padding-right: 2px; padding-left: 2px; margin-left: 3px; font-weight: bold; + line-height: 28px; + vertical-align: middle; + color: govuk-colour("white"); + text-align: center; - vertical-align: middle; background-color: $govuk-brand-colour; border-radius: 14px; diff --git a/app/frontend/styles/support/_checkboxes-scroll.scss b/app/frontend/styles/support/_checkboxes-scroll.scss index 530669ba310..1bcd330c448 100644 --- a/app/frontend/styles/support/_checkboxes-scroll.scss +++ b/app/frontend/styles/support/_checkboxes-scroll.scss @@ -1,7 +1,9 @@ .app-checkboxes-scroll { height: 75vh; min-height: 13.5em; + padding: govuk-spacing(2); + overflow-y: scroll; border: $govuk-border-width-form-element solid $govuk-input-border-colour; diff --git a/app/frontend/styles/support/_sort.scss b/app/frontend/styles/support/_sort.scss index 5ca73268b2c..eb42456f3a8 100644 --- a/app/frontend/styles/support/_sort.scss +++ b/app/frontend/styles/support/_sort.scss @@ -22,11 +22,12 @@ } .govuk-form-group { + clear: both; + display: inline-block; margin-top: govuk-spacing(2); margin-bottom: 0; - clear: both; @include mq($from: desktop) { margin: 0; @@ -35,6 +36,7 @@ .govuk-button { float: right; + margin: govuk-spacing(2) 0 0; @include mq($from: desktop) {