From cd01459bb364bf729790a5f77ad778e0366b7a67 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson <frjo@xdeb.org> Date: Sat, 21 Dec 2024 17:12:22 +0100 Subject: [PATCH] Remoce stylelint rules that are no longer needed with later versions. --- .stylelintrc.yaml | 64 ------------------- hypha/static_src/sass/abstracts/_mixins.scss | 5 +- .../static_src/sass/abstracts/_variables.scss | 2 + hypha/static_src/sass/base/_base.scss | 1 - .../sass/components/_all-reviews-table.scss | 2 - .../components/_all-submissions-table.scss | 3 +- hypha/static_src/sass/components/_button.scss | 1 - .../sass/components/_dashboard-table.scss | 3 - hypha/static_src/sass/components/_feed.scss | 1 - hypha/static_src/sass/components/_form.scss | 8 +-- .../sass/components/_nprogress.scss | 2 +- .../sass/components/_projects-table.scss | 4 -- .../sass/components/_reviews-sidebar.scss | 2 - .../static_src/sass/components/_select2.scss | 5 +- .../sass/components/_submission-meta.scss | 1 - hypha/static_src/sass/components/_table.scss | 2 - hypha/static_src/sass/components/_tabs.scss | 2 +- .../sass/components/_two-factor.scss | 2 +- hypha/static_src/sass/print.scss | 1 - hypha/static_src/sass/wagtail_users_list.scss | 2 + 20 files changed, 13 insertions(+), 100 deletions(-) diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index 4e12a9b097..b1408fd2d2 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -1,73 +1,9 @@ extends: - - stylelint-config-standard - stylelint-config-standard-scss rules: - at-rule-disallowed-list: - - debug - at-rule-no-unknown: null - at-rule-no-vendor-prefix: true - block-no-empty: null - color-hex-length: short - color-named: never - color-no-invalid-hex: true declaration-block-no-redundant-longhand-properties: null - declaration-block-single-line-max-declarations: 1 declaration-empty-line-before: null - declaration-no-important: true - declaration-property-value-disallowed-list: - border: - - none - border-top: - - none - border-right: - - none - border-bottom: - - none - border-left: - - none - font-family-name-quotes: null - function-url-quotes: always - length-zero-no-unit: true - max-nesting-depth: - - 4 - - ignoreAtRules: - - each - - media - - supports - - include - media-feature-name-no-vendor-prefix: true - media-feature-range-notation: prefix no-descending-specificity: null - property-no-unknown: true - property-no-vendor-prefix: true - rule-empty-line-before: - - always-multi-line - - except: - - first-nested - ignore: - - after-comment - scss/at-extend-no-missing-placeholder: true - scss/at-function-pattern: "^[a-z]+([a-z0-9-]+[a-z0-9]+)?$" - scss/load-no-partial-leading-underscore: true - scss/at-import-partial-extension-disallowed-list: - - scss - scss/at-mixin-pattern: "^[a-z]+([a-z0-9-]+[a-z0-9]+)?$" - scss/at-rule-no-unknown: true - scss/comment-no-empty: null - #scss/dollar-variable-colon-space-after: always - scss/dollar-variable-colon-space-before: never - scss/dollar-variable-pattern: "^[_]?[a-z]+([a-z0-9-]+[a-z0-9]+)?$" - scss/no-global-function-names: null - #scss/percent-placeholder-pattern: "^[a-z]+([a-z0-9-]+[a-z0-9]+)?$" - #scss/selector-no-redundant-nesting-selector: true selector-class-pattern: - "^[a-z0-9\\-]+$" - message: Selector should be written in lowercase with hyphens (selector-class-pattern) - selector-max-compound-selectors: 3 - selector-max-id: 0 - #selector-no-qualifying-type: true - selector-no-vendor-prefix: true - selector-pseudo-element-colon-notation: double - selector-pseudo-element-no-unknown: true - shorthand-property-no-redundant-values: true - value-no-vendor-prefix: true diff --git a/hypha/static_src/sass/abstracts/_mixins.scss b/hypha/static_src/sass/abstracts/_mixins.scss index b1c5e4e07b..b9d28fbe65 100644 --- a/hypha/static_src/sass/abstracts/_mixins.scss +++ b/hypha/static_src/sass/abstracts/_mixins.scss @@ -1,11 +1,10 @@ @use "sass:list"; @use "functions"; @use "variables"; - -// stylelint-disable - @use "sass:math"; +// stylelint-disable scss/at-mixin-pattern + // Media queries @mixin media-query($queries...) { @each $query in $queries { diff --git a/hypha/static_src/sass/abstracts/_variables.scss b/hypha/static_src/sass/abstracts/_variables.scss index 071c4d38f1..66b899fba3 100644 --- a/hypha/static_src/sass/abstracts/_variables.scss +++ b/hypha/static_src/sass/abstracts/_variables.scss @@ -1,3 +1,5 @@ +// stylelint-disable scss/dollar-variable-pattern + // Most variables are set from css variables defined in // tailwind/base/variables.css so they are easy to override. // Only variables used in media queries and calculations are defined here. diff --git a/hypha/static_src/sass/base/_base.scss b/hypha/static_src/sass/base/_base.scss index 28547c7b0a..8595d17570 100644 --- a/hypha/static_src/sass/base/_base.scss +++ b/hypha/static_src/sass/base/_base.scss @@ -1,6 +1,5 @@ @use "../abstracts/variables"; -// stylelint-disable property-no-vendor-prefix body { overflow-x: hidden; diff --git a/hypha/static_src/sass/components/_all-reviews-table.scss b/hypha/static_src/sass/components/_all-reviews-table.scss index 98088050b2..8ab774567a 100644 --- a/hypha/static_src/sass/components/_all-reviews-table.scss +++ b/hypha/static_src/sass/components/_all-reviews-table.scss @@ -1,8 +1,6 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-max-compound-selectors - .all-reviews-table { @include mixins.table-ordering-styles; diff --git a/hypha/static_src/sass/components/_all-submissions-table.scss b/hypha/static_src/sass/components/_all-submissions-table.scss index c55a76b4eb..e2e1dd84a7 100644 --- a/hypha/static_src/sass/components/_all-submissions-table.scss +++ b/hypha/static_src/sass/components/_all-submissions-table.scss @@ -1,7 +1,7 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-class-pattern,selector-max-compound-selectors +// stylelint-disable selector-class-pattern .all-submissions-table { @include mixins.table-ordering-styles; @@ -177,7 +177,6 @@ } } - // stylelint-disable-next-line force-element-nesting > span.mobile-label { display: inline-block; width: 90px; diff --git a/hypha/static_src/sass/components/_button.scss b/hypha/static_src/sass/components/_button.scss index 147a6fbbf8..8980aa65f5 100644 --- a/hypha/static_src/sass/components/_button.scss +++ b/hypha/static_src/sass/components/_button.scss @@ -62,7 +62,6 @@ } &--login { - /* stylelint-disable-next-line media-query-no-invalid */ @media (min-width: variables.$input-box-max-width) { width: 20rem; } diff --git a/hypha/static_src/sass/components/_dashboard-table.scss b/hypha/static_src/sass/components/_dashboard-table.scss index c11ac8cd27..ab949ac77c 100644 --- a/hypha/static_src/sass/components/_dashboard-table.scss +++ b/hypha/static_src/sass/components/_dashboard-table.scss @@ -1,8 +1,6 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-max-compound-selectors - .paf-review-table { @include mixins.table-ordering-styles; @@ -41,7 +39,6 @@ tbody { td { - // stylelint-disable-next-line force-element-nesting > span.mobile-label { display: inline-block; width: 90px; diff --git a/hypha/static_src/sass/components/_feed.scss b/hypha/static_src/sass/components/_feed.scss index dc1ccda8f8..2a5edacb53 100644 --- a/hypha/static_src/sass/components/_feed.scss +++ b/hypha/static_src/sass/components/_feed.scss @@ -134,7 +134,6 @@ span { &:first-child { - // stylelint-disable-next-line max-nesting-depth &::after { @include mixins.triangle( right, diff --git a/hypha/static_src/sass/components/_form.scss b/hypha/static_src/sass/components/_form.scss index 13f01753ae..3becca3b31 100644 --- a/hypha/static_src/sass/components/_form.scss +++ b/hypha/static_src/sass/components/_form.scss @@ -1,9 +1,6 @@ @use "../base/base"; @use "../abstracts/mixins"; @use "../abstracts/variables"; - -// stylelint-disable selector-max-compound-selectors - @use "sass:math"; .form { @@ -260,7 +257,6 @@ } input { - // stylelint-disable-next-line max-nesting-depth &:first-of-type { @supports (display: grid) { grid-column: 1; @@ -455,7 +451,7 @@ } &__comments { - // stylelint-disable-next-line selector-class-pattern,selector-id-pattern,selector-max-id + // stylelint-disable-next-line selector-class-pattern,selector-id-pattern ul#id_visibility { display: flex; flex-wrap: wrap; @@ -487,7 +483,7 @@ .address { padding: 0.4em; - border: 1px solid #cfcfcf8f; // stylelint-disable-line color-no-hex + border: 1px solid #cfcfcf8f; max-width: 410px; // stylelint-disable-next-line selector-class-pattern diff --git a/hypha/static_src/sass/components/_nprogress.scss b/hypha/static_src/sass/components/_nprogress.scss index 34456331e2..9b4d3adc30 100644 --- a/hypha/static_src/sass/components/_nprogress.scss +++ b/hypha/static_src/sass/components/_nprogress.scss @@ -1,6 +1,6 @@ @use "../abstracts/variables"; -/* stylelint-disable selector-max-id, length-zero-no-unit -- CSS from https://github.com/rstacruz/nprogress */ +/* stylelint-disable length-zero-no-unit -- CSS from https://github.com/rstacruz/nprogress */ #nprogress { /* Make clicks pass-through */ pointer-events: none; diff --git a/hypha/static_src/sass/components/_projects-table.scss b/hypha/static_src/sass/components/_projects-table.scss index 160a6c5c8b..fa61938caf 100644 --- a/hypha/static_src/sass/components/_projects-table.scss +++ b/hypha/static_src/sass/components/_projects-table.scss @@ -1,8 +1,6 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-max-compound-selectors - .projects-table { @include mixins.table-ordering-styles; @@ -16,7 +14,6 @@ tbody { td { - // stylelint-disable-next-line force-element-nesting > span.mobile-label { display: inline-block; width: 90px; @@ -62,7 +59,6 @@ tbody { td { - // stylelint-disable-next-line force-element-nesting > span.mobile-label { display: inline-block; width: 90px; diff --git a/hypha/static_src/sass/components/_reviews-sidebar.scss b/hypha/static_src/sass/components/_reviews-sidebar.scss index eb01e1c464..273f8f75fb 100644 --- a/hypha/static_src/sass/components/_reviews-sidebar.scss +++ b/hypha/static_src/sass/components/_reviews-sidebar.scss @@ -1,8 +1,6 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable max-nesting-depth - .reviews-sidebar { $root: &; margin-block-end: 20px; diff --git a/hypha/static_src/sass/components/_select2.scss b/hypha/static_src/sass/components/_select2.scss index be4cee75ac..a5bcd9357f 100644 --- a/hypha/static_src/sass/components/_select2.scss +++ b/hypha/static_src/sass/components/_select2.scss @@ -1,7 +1,7 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-max-compound-selectors, selector-class-pattern +// stylelint-disable selector-class-pattern .select2 { &-container { @@ -10,7 +10,6 @@ .select2-container--default, &.select2-container--default { - // stylelint-disable-next-line declaration-no-important width: 100% !important; .select2-selection--single { @@ -58,9 +57,7 @@ .select2-container { &--default { .select2-results__option--highlighted[aria-selected] { - // stylelint-disable-next-line declaration-no-important color: variables.$color--default !important; - // stylelint-disable declaration-no-important, max-line-length background-color: variables.$color--light-blue-90 !important; } } diff --git a/hypha/static_src/sass/components/_submission-meta.scss b/hypha/static_src/sass/components/_submission-meta.scss index 5b7f2fdd65..28f939dc79 100644 --- a/hypha/static_src/sass/components/_submission-meta.scss +++ b/hypha/static_src/sass/components/_submission-meta.scss @@ -6,7 +6,6 @@ tbody { td { &.phase { - // stylelint-disable-next-line selector-max-compound-selectors span { display: inline-block; padding: 10px; diff --git a/hypha/static_src/sass/components/_table.scss b/hypha/static_src/sass/components/_table.scss index 9ada233f5b..56df0ccafb 100644 --- a/hypha/static_src/sass/components/_table.scss +++ b/hypha/static_src/sass/components/_table.scss @@ -1,8 +1,6 @@ @use "../abstracts/mixins"; @use "../abstracts/variables"; -// stylelint-disable selector-max-compound-selectors,max-nesting-depth - .table-container { > table { border: 1px solid variables.$color--light-mid-grey; diff --git a/hypha/static_src/sass/components/_tabs.scss b/hypha/static_src/sass/components/_tabs.scss index e1b4b874ea..629f4f0218 100644 --- a/hypha/static_src/sass/components/_tabs.scss +++ b/hypha/static_src/sass/components/_tabs.scss @@ -50,7 +50,7 @@ background-color: rgba( #fff, 0.8 - ); // stylelint-disable-line color-no-hex + ); } &--alt { diff --git a/hypha/static_src/sass/components/_two-factor.scss b/hypha/static_src/sass/components/_two-factor.scss index a7e6c9d677..98bfa6f98b 100644 --- a/hypha/static_src/sass/components/_two-factor.scss +++ b/hypha/static_src/sass/components/_two-factor.scss @@ -1,4 +1,4 @@ -// stylelint-disable property-no-vendor-prefix, selector-id-pattern, selector-max-id +// stylelint-disable property-no-vendor-prefix, selector-id-pattern @use "../base/typography"; .two-factor { diff --git a/hypha/static_src/sass/print.scss b/hypha/static_src/sass/print.scss index 2fd8d3a477..e189ff569a 100644 --- a/hypha/static_src/sass/print.scss +++ b/hypha/static_src/sass/print.scss @@ -1,4 +1,3 @@ -// stylelint-disable color-no-hex, no-color-literals, declaration-no-important // stylelint-disable property-no-vendor-prefix, selector-class-pattern * { background: transparent !important; diff --git a/hypha/static_src/sass/wagtail_users_list.scss b/hypha/static_src/sass/wagtail_users_list.scss index 30ce17c7f5..5b8d523a12 100644 --- a/hypha/static_src/sass/wagtail_users_list.scss +++ b/hypha/static_src/sass/wagtail_users_list.scss @@ -1,3 +1,5 @@ +// stylelint-disable media-feature-range-notation + .users-list { padding-inline-start: 1rem; padding-inline-end: 1rem;