From f9a82b5f6dc1a4f52230546a3da4309ce6b941d9 Mon Sep 17 00:00:00 2001 From: Gregor Billing Date: Sun, 26 Jun 2022 21:06:29 +0900 Subject: [PATCH] Fix some StyleLint warning that snuck in during monthly Dependabot upgrades --- WcaOnRails/app/assets/stylesheets/application.css.scss | 2 ++ WcaOnRails/app/assets/stylesheets/competitions.scss | 2 +- WcaOnRails/app/assets/stylesheets/fullcalendar_wca.scss | 2 +- WcaOnRails/app/assets/stylesheets/pdf.css.scss | 2 +- WcaOnRails/app/webpacker/stylesheets/competition_results.scss | 2 +- stylelint.config.js | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WcaOnRails/app/assets/stylesheets/application.css.scss b/WcaOnRails/app/assets/stylesheets/application.css.scss index 1fd12a5bb9c..ecd83c0d46f 100644 --- a/WcaOnRails/app/assets/stylesheets/application.css.scss +++ b/WcaOnRails/app/assets/stylesheets/application.css.scss @@ -18,8 +18,10 @@ @import "bootstrap-datetimepicker"; @import "selectize"; +/* stylelint-disable scss/at-import-partial-extension */ @import "selectize.bootstrap3"; @import "jquery.jcrop"; +/* stylelint-enable scss/at-import-partial-extension */ @import "bootstrap-table-parts"; @import "slick"; @import "slick-theme"; diff --git a/WcaOnRails/app/assets/stylesheets/competitions.scss b/WcaOnRails/app/assets/stylesheets/competitions.scss index c2eb9980641..4a7c56a3c38 100644 --- a/WcaOnRails/app/assets/stylesheets/competitions.scss +++ b/WcaOnRails/app/assets/stylesheets/competitions.scss @@ -204,7 +204,7 @@ $venue-map-wrapper-height: 400px; left: 0; right: 0; z-index: 10; - background-color: transparentize(white, 0.5); + background-color: transparentize(white, 0.5); /* stylelint-disable-line scss/no-global-function-names */ .spinner-wrapper { position: absolute; top: 50%; diff --git a/WcaOnRails/app/assets/stylesheets/fullcalendar_wca.scss b/WcaOnRails/app/assets/stylesheets/fullcalendar_wca.scss index 76f13d6cb51..e0b51c5ba9d 100644 --- a/WcaOnRails/app/assets/stylesheets/fullcalendar_wca.scss +++ b/WcaOnRails/app/assets/stylesheets/fullcalendar_wca.scss @@ -1 +1 @@ -@import "fullcalendar.min"; +@import "fullcalendar.min"; /* stylelint-disable-line scss/at-import-partial-extension */ diff --git a/WcaOnRails/app/assets/stylesheets/pdf.css.scss b/WcaOnRails/app/assets/stylesheets/pdf.css.scss index a216f7797a5..6048c8a3e51 100644 --- a/WcaOnRails/app/assets/stylesheets/pdf.css.scss +++ b/WcaOnRails/app/assets/stylesheets/pdf.css.scss @@ -8,7 +8,7 @@ a { // We need the import here, otherwise Rails' asset adds a BOM at the beginning of it, // and the font doesn't get recognize! -@import "cubing-icons"; +@import "cubing-icons"; /* stylelint-disable-line no-invalid-position-at-import-rule */ header { width: 100%; diff --git a/WcaOnRails/app/webpacker/stylesheets/competition_results.scss b/WcaOnRails/app/webpacker/stylesheets/competition_results.scss index ec84faf29bf..d51eec199f6 100644 --- a/WcaOnRails/app/webpacker/stylesheets/competition_results.scss +++ b/WcaOnRails/app/webpacker/stylesheets/competition_results.scss @@ -1,4 +1,4 @@ -@import "variables.scss"; +@import "variables"; .competition-results { .events-list { diff --git a/stylelint.config.js b/stylelint.config.js index e8bbf00d2e0..7adbe9b859e 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -3,7 +3,8 @@ module.exports = { rules: { "no-descending-specificity": null, "block-no-empty": null, - "font-family-no-missing-generic-family-keyword": null + "font-family-no-missing-generic-family-keyword": null, + "scss/at-extend-no-missing-placeholder": null }, ignoreFiles: ["WcaOnRails/app/assets/stylesheets/selectize.default.css"] };