Merge branch '997-stylelint' into 'master'

Replace scss-lint with stylelint 13.9.0 and @gitlab/stylelint-config 2.3.0

Closes #997

See merge request gitlab-org/gitlab-docs!1713

4 files changed, 6 insertions, 20 deletions

diff --git a/content/assets/stylesheets/help.scss b/content/assets/stylesheets/help.scss
index e78da6cc..1e3b0f10 100644
--- a/content/assets/stylesheets/help.scss
+++ b/content/assets/stylesheets/help.scss
@@ -25,7 +25,6 @@ version: 4
     }
   }
 
-  // scss-lint:disable QualifyingElement
   h4,
   h5 {
     border-bottom: 0;
@@ -47,7 +46,6 @@ version: 4
     margin-bottom: 0;
     color: $help-gray-900;
   }
-  // scss-lint:enable QualifyingElement
 
   .help-icon,
   .toggle-icon {
@@ -55,11 +53,9 @@ version: 4
     vertical-align: text-top;
   }
 
-  // scss-lint:disable ImportantRule
   .help-icon {
     margin-left: 0 !important;
   }
-  // scss-lint:enable ImportantRule
 
   .toggle-icon {
     float: right;
diff --git a/content/assets/stylesheets/instantsearch.scss b/content/assets/stylesheets/instantsearch.scss
index 9f78feae..ae0adbc1 100644
--- a/content/assets/stylesheets/instantsearch.scss
+++ b/content/assets/stylesheets/instantsearch.scss
@@ -24,12 +24,11 @@ $color11: transparent;
 $color12: rgba(32, 139, 196, 0.2); //link color lighter
 
 
-//scss-lint:disable ImportantRule SelectorFormat
+/* stylelint-disable-next-line selector-class-pattern */
 .ais-SearchBox {
   width: 100%;
   max-width: 100% !important; // was 300px
 }
-//scss-lint:enable ImportantRule SelectorFormat
 
 .search-input {
   border-radius: 2px;
@@ -41,7 +40,7 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
   }
 }
 
-//scss-lint:disable SelectorFormat
+/* stylelint-disable-next-line selector-class-pattern */
 .ais-PoweredBy {
   font-family: $sans-font-family;
   font-size: $body-font-size;
@@ -50,7 +49,6 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
     display: inline;
   }
 }
-//scss-lint:enable SelectorFormat
 
 .hit-content {
   border-top: 1px solid $color0;
@@ -77,11 +75,9 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
     color: $black;
   }
 
-  //scss-lint:disable ImportantRule
   .lvl1 {
     font-size: 18px !important;
   }
-  //scss-lint:enable ImportantRule
 
   .lvl2 {
     font-size: 14px;
@@ -143,13 +139,12 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
   }
 }
 
-//scss-lint:disable IdSelector
 #hits {
+  /* stylelint-disable-next-line selector-list-comma-newline-after */
   > h1, h2, h3, h4, h5, h6 {
     border: 0;
   }
 }
-//scss-lint:enable IdSelector
 
 //overrides padding for the searchbox
 .main.class {
@@ -164,7 +159,7 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
   background-color: $color3;
 }
 
-//scss-lint:disable SelectorFormat
+/* stylelint-disable selector-class-pattern */
 .ais-InfiniteHits {
   .ais-InfiniteHits-item {
     // https://github.com/algolia/instantsearch-specs/blob/v7.4.4/src/scss/themes/algolia.scss#L277-L305
@@ -197,7 +192,7 @@ $color12: rgba(32, 139, 196, 0.2); //link color lighter
   text-transform: uppercase;
   color: $link-color;
 }
-//scss-lint:enable SelectorFormat
+/* stylelint-enable selector-class-pattern */
 
 .search-results {
   min-height: 50vh;
diff --git a/content/assets/stylesheets/stylesheet.scss b/content/assets/stylesheets/stylesheet.scss
index 1a573b0b..6ae49996 100644
--- a/content/assets/stylesheets/stylesheet.scss
+++ b/content/assets/stylesheets/stylesheet.scss
@@ -1079,8 +1079,6 @@ p {
   }
 }
 
-// scss-lint:disable MergeableSelector
-// skipping scss-lint rule: keeping all the badges styles together
 h1,
 h2,
 h3,
@@ -1107,7 +1105,6 @@ li {
   }
 }
 
-// scss-lint:enable MergeableSelector
 .badge-display {
   text-transform: uppercase;
   text-align: center;
@@ -1158,13 +1155,11 @@ li {
   }
 }
 
-// scss-lint:disable ImportantRule
 .dotcom-false {
   .badge-saas {
     display: none;
   }
 }
-// scss-lint:enable ImportantRule
 
 //
 // Algolia search override
diff --git a/content/assets/stylesheets/toc.scss b/content/assets/stylesheets/toc.scss
index 56576d44..74dd2eb9 100644
--- a/content/assets/stylesheets/toc.scss
+++ b/content/assets/stylesheets/toc.scss
@@ -1,7 +1,6 @@
 ---
 version: 19
 ---
-
 @import 'variables';
 @import 'utilities';
 
@@ -36,6 +35,7 @@ $nav-link-font-size: 14px;
       background-color: transparent;
       border-color: $gds-indigo-800;
 
+      /* stylelint-disable-next-line selector-list-comma-newline-after */
       &:hover, &:only-child {
         color: $link-color-nav-hover;
         background-color: transparent;