Sass lint: replace scss-lint disable comments

- Replace `scss-lint` disable comments with the `sass-lint` ones
- Remove `scss-lint` disable comments when they are useless or not
supported

diff --git a/scss/_global.scss b/scss/_global.scss
index 1c5f87061819f28803323f1278b6374b3199d882..4ed320ab38414ffc6fb57f72a4b5c9c7faf29c4a 100644 (file)
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -2,7 +2,7 @@
 // foundation.zurb.com
 // Licensed under MIT Open Source
 
-// scss-lint:disable ColorVariable, QualifyingElement, VendorPrefix
+// sass-lint:disable force-attribute-nesting, force-pseudo-nesting, no-color-literals, no-qualifying-elements
 
 ////
 /// @group global
@@ -176,8 +176,7 @@ $-zf-flex-classes-imported: false;
   }
 
   // Styles Google Maps and MapQuest embeds properly
-  // scss-lint:disable IdSelector
-  #map_canvas,
+  // sass-lint:disable-line no-ids
   .map_canvas,
   .mqa-display {
     img,

diff --git a/scss/components/_button-group.scss b/scss/components/_button-group.scss
index ddc7727710afbfbaacecee06857d665def725ea1..6f6fc1960a8fdaf7ea8f6bb5883401237056f732 100644 (file)
--- a/scss/components/_button-group.scss
+++ b/scss/components/_button-group.scss
@@ -89,10 +89,9 @@ $buttongroup-radius-on-each: true !default;
     }
   }
 
-  // scss-lint:disable ZeroUnit
   #{$selector} {
     @if $global-flexbox {
-      flex: 1 1 0px;
+      flex: 1 1 0px; // sass-lint:disable-line zero-unit
     }
     @else {
       @for $i from 2 through $buttongroup-expand-max {
@@ -157,10 +156,9 @@ $buttongroup-radius-on-each: true !default;
 @mixin button-group-unstack(
   $selector: $buttongroup-child-selector
 ) {
-  // scss-lint:disable ZeroUnit
   #{$selector} {
     @if $global-flexbox {
-      flex: 1 1 0px;
+      flex: 1 1 0px; // sass-lint:disable-line zero-unit
     }
     @else {
       width: auto;
@@ -231,8 +229,7 @@ $buttongroup-radius-on-each: true !default;
       }
     }
 
-    // scss-lint:disable MergeableSelector
-    &.stacked-for-small.expanded {
+    &.stacked-for-small.expanded { // sass-lint:disable-line force-element-nesting
       @include breakpoint(small only) {
         display: block;
 

diff --git a/scss/components/_dropdown-menu.scss b/scss/components/_dropdown-menu.scss
index a9b8242234110c4a22ad9711cc22b3722cfdef06..5dceed62604732ded372713ae4b4b228f830a477 100644 (file)
--- a/scss/components/_dropdown-menu.scss
+++ b/scss/components/_dropdown-menu.scss
@@ -215,7 +215,6 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1);
     }
 
     // [TODO] Cut back specificity
-    // scss-lint:disable SelectorDepth
     //&:not(.js-dropdown-nohover) > .is-dropdown-submenu-parent:hover > &, // why is this line needed? Opening is handled by JS and this causes some ugly flickering when the sub is re-positioned automatically...
     &.js-dropdown-active {
       display: block;

diff --git a/scss/components/_media-object.scss b/scss/components/_media-object.scss
index c8222f61adba8d8a8dbf572b330e774c266abec0..3c85f46f556d2dfbce11c627836cdac6f60f8e1f 100644 (file)
--- a/scss/components/_media-object.scss
+++ b/scss/components/_media-object.scss
@@ -97,9 +97,8 @@ $mediaobject-image-width-stacked: 100% !default;
     @include media-object-section;
 
     @if $global-flexbox {
-      // scss-lint:disable ZeroUnit
       &.main-section {
-        flex: 1 1 0px;
+        flex: 1 1 0px; // sass-lint:disable-line zero-unit
       }
     }
     @else {

diff --git a/scss/components/_menu.scss b/scss/components/_menu.scss
index 7cafc0657ac7d8846e6d6862f584e4c61f2d885f..97bf21a87e0ba05376d331dec096a18d7bfc61cf 100644 (file)
--- a/scss/components/_menu.scss
+++ b/scss/components/_menu.scss
@@ -83,9 +83,8 @@ $menu-border: $light-gray !default;
 /// Expands the items of a Menu, so each item is the same width.
 @mixin menu-expand {
   @if $global-flexbox {
-    // scss-lint:disable ZeroUnit
     > li {
-      flex: 1 1 0px;
+      flex: 1 1 0px; // sass-lint:disable-line zero-unit
     }
   }
   @else {

diff --git a/scss/components/_reveal.scss b/scss/components/_reveal.scss
index 5a3c15c6f969dcdccf7b2027c6316fab450eba93..c226a19a4ed63b250e8a8eda53281038d5d3ecdf 100644 (file)
--- a/scss/components/_reveal.scss
+++ b/scss/components/_reveal.scss
@@ -97,14 +97,13 @@ $reveal-overlay-background: rgba($black, 0.45) !default;
 
 /// Creates a full-screen modal, which stretches the full width and height of the window.
 @mixin reveal-modal-fullscreen {
-  // scss-lint:disable DuplicateProperty
   top: 0;
   left: 0;
 
   width: 100%;
   max-width: none;
   height: 100%;
-  height: 100vh;
+  height: 100vh; // sass-lint:disable-line no-duplicate-properties
   min-height: 100vh;
   margin-left: 0;
 
@@ -114,8 +113,7 @@ $reveal-overlay-background: rgba($black, 0.45) !default;
 
 @mixin foundation-reveal {
   // [TODO] Is this necessary?
-  // scss-lint:disable QualifyingElement
-  body.is-reveal-open {
+  body.is-reveal-open { // sass-lint:disable-line no-qualifying-elements
     overflow: hidden;
   }
 

diff --git a/scss/components/_table.scss b/scss/components/_table.scss
index c17eccc95231a3bad2be725a4381ac47d4d180c4..388f1d73e37b03a91993a1b60cb43ee2f43368e5 100644 (file)
--- a/scss/components/_table.scss
+++ b/scss/components/_table.scss
@@ -2,7 +2,7 @@
 // foundation.zurb.com
 // Licensed under MIT Open Source
 
-// scss-lint:disable MergeableSelector, QualifyingElement
+// sass-lint:disable force-element-nesting, no-qualifying-elements
 
 ////
 /// @group table

diff --git a/scss/components/_title-bar.scss b/scss/components/_title-bar.scss
index 94bd94bec7a2d4b1c23e8f7c25a8edd7920879f2..de754c7f35041a2e99fbcce6dac8748872de3be1 100644 (file)
--- a/scss/components/_title-bar.scss
+++ b/scss/components/_title-bar.scss
@@ -56,10 +56,9 @@ $titlebar-icon-spacing: 0.25rem !default;
   }
 
   @if $global-flexbox {
-    // scss-lint:disable ZeroUnit
     .title-bar-left,
     .title-bar-right {
-      flex: 1 1 0px;
+      flex: 1 1 0px; // sass-lint:disable-line zero-unit
     }
 
     .title-bar-right {

diff --git a/scss/components/_top-bar.scss b/scss/components/_top-bar.scss
index d84ec6a8d7adbde7bd5552146b702b67fd173e38..e216c2aa1f061daca79231e66ad6d7e72c04cf0d 100644 (file)
--- a/scss/components/_top-bar.scss
+++ b/scss/components/_top-bar.scss
@@ -68,8 +68,7 @@ $topbar-unstack-breakpoint: medium !default;
     margin-#{$global-right}: 0;
   }
 
-  // scss-lint:disable QualifyingElement
-  input.button {
+  input.button { // sass-lint:disable-line no-qualifying-elements
     width: auto;
   }
 }
@@ -100,7 +99,6 @@ $topbar-unstack-breakpoint: medium !default;
   @if $global-flexbox {
     flex-wrap: nowrap;
 
-    // scss-lint:disable ZeroUnit
     .top-bar-left {
       flex: 1 1 auto;
     }

diff --git a/scss/forms/_input-group.scss b/scss/forms/_input-group.scss
index 1e32da5e9cfc112e14b486cc10f241ce95f680d7..33995a7c44f515905fa417217f48e124954a7e19 100644 (file)
--- a/scss/forms/_input-group.scss
+++ b/scss/forms/_input-group.scss
@@ -89,9 +89,8 @@ $input-prefix-padding: 1rem !default;
     @extend %input-group-child;
     border-radius: 0;
 
-    // scss-lint:disable ZeroUnit
     @if $global-flexbox {
-      flex: 1 1 0px;
+      flex: 1 1 0px; // sass-lint:disable-line zero-unit
       height: auto;
     }
     @else {
@@ -127,7 +126,6 @@ $input-prefix-padding: 1rem !default;
   }
 
   // Specificity bump needed to prevent override by buttons
-  // scss-lint:disable QualifyingSelector
   @if not $global-flexbox {
       .input-group .input-group-button {
           display: table-cell;

diff --git a/scss/forms/_range.scss b/scss/forms/_range.scss
index 4c032b6d77e35ea6d413a3de8de377043935e1dc..b5766419d5ac15a9b23336f8b197417c3cdac06e 100644 (file)
--- a/scss/forms/_range.scss
+++ b/scss/forms/_range.scss
@@ -39,8 +39,7 @@ $slider-opacity-disabled: 0.25 !default;
 $slider-radius: $global-radius !default;
 
 @mixin foundation-range-input {
-  // scss-lint:disable QualifyingElement
-  input[type="range"] {
+  input[type="range"] {  // sass-lint:disable-line no-qualifying-elements
     $margin: ($slider-handle-height - $slider-height) / 2;
 
     display: block;

diff --git a/scss/forms/_text.scss b/scss/forms/_text.scss
index 1df2c89adba72599adf02eb7a95741d589a88b02..87406fc0c21710bd042794c28aea9beb4d04fc27 100644 (file)
--- a/scss/forms/_text.scss
+++ b/scss/forms/_text.scss
@@ -151,8 +151,7 @@ $form-button-radius: $global-radius !default;
   }
 
   // Reset Normalize setting content-box to search elements
-  // scss-lint:disable QualifyingElement
-  input[type='search'] {
+  input[type='search'] { // sass-lint:disable-line no-qualifying-elements
     box-sizing: border-box;
   }
 

diff --git a/scss/grid/_classes.scss b/scss/grid/_classes.scss
index 0bf814a718a0a098941d7519010a68af8acf071c..e2c46c00ba0d7721d073e2da7ea82f6d47c67272 100644 (file)
--- a/scss/grid/_classes.scss
+++ b/scss/grid/_classes.scss
@@ -156,7 +156,7 @@
 
   @if $column == 'column' {
     .columns {
-      // scss-lint:disable PlaceholderInExtend
+      // sass-lint:disable-block placeholder-in-extend
       @extend .column;
     }
   }

diff --git a/scss/grid/_flex-grid.scss b/scss/grid/_flex-grid.scss
index 2b7aa4dc4f40bef756607b30819366b051cb556d..a7919c8921edd8328977a098d64df8d2ddca4e83 100644 (file)
--- a/scss/grid/_flex-grid.scss
+++ b/scss/grid/_flex-grid.scss
@@ -57,8 +57,7 @@
 ///
 /// @param {Mixed} $columns [expand] - Width of the column.
 @function flex-grid-column($columns: expand) {
-  // scss-lint:disable ZeroUnit
-  $flex: 1 1 0px;
+  $flex: 1 1 0px; // sass-lint:disable-line zero-unit
 
   @if $columns == shrink {
     $flex: 0 0 auto;
@@ -318,7 +317,7 @@
   }
 
   .columns {
-    // scss-lint:disable PlaceholderInExtend
-    @extend .column;
+    @extend .column; // sass-lint:disable-line placeholder-in-extend
+
   }
 }

diff --git a/scss/grid/_grid.scss b/scss/grid/_grid.scss
index 056c4380bae71129ca78273f76a032b46c5f908e..eab0dc1c8c22deadab1113a987c604747d68e7f1 100644 (file)
--- a/scss/grid/_grid.scss
+++ b/scss/grid/_grid.scss
@@ -37,7 +37,6 @@ $-zf-end-float: if($grid-column-align-edge, $global-right, $global-left);
 // Remove this in 6.3
 $grid-column-responsive-gutter: null !default;
 @if $grid-column-responsive-gutter {
-  // scss-lint:disable DebugStatement
   @warn 'Rename $grid-column-responsive-gutter to $grid-column-gutter to remove this warning.';
   $grid-column-gutter: $grid-column-responsive-gutter;
 }

diff --git a/scss/typography/_print.scss b/scss/typography/_print.scss
index 9518f3e20360ea80285bb1d9062762d8e3858465..2de0fa9aa26f1d02b7177c377e8cfde931c62142 100644 (file)
--- a/scss/typography/_print.scss
+++ b/scss/typography/_print.scss
@@ -8,7 +8,7 @@
 $print-transparent-backgrounds: true !default;
 $print-hrefs: true !default;
 
-// scss-lint:disable all
+// sass-lint:disable-all
 
 @mixin foundation-print-styles {
   .show-for-print { display: none !important; }

diff --git a/scss/typography/_typography.scss b/scss/typography/_typography.scss
index d17c16ab891131f98f19dd48cebfd31298f9ce1e..c794126adf7753df23d17331c89a53e0978b15e3 100644 (file)
--- a/scss/typography/_typography.scss
+++ b/scss/typography/_typography.scss
@@ -6,8 +6,6 @@
 /// @group typography
 ////
 
-// scss-lint:disable DeclarationOrder
-
 // Base typography styles (tags only)
 @import 'base';
 

diff --git a/scss/util/_breakpoint.scss b/scss/util/_breakpoint.scss
index 8d93b5e61989c08520239b8db36acd7900703f8f..50f6f22b90c0fec8d7d3f8b2f9589260ff8f6925 100644 (file)
--- a/scss/util/_breakpoint.scss
+++ b/scss/util/_breakpoint.scss
@@ -6,8 +6,6 @@
 /// @group breakpoints
 ////
 
-// scss-lint:disable ZeroUnit
-
 /// A list of named breakpoints. You can use these with the `breakpoint()` mixin to quickly create media queries.
 /// @type Map
 $breakpoints: (

diff --git a/scss/util/_unit.scss b/scss/util/_unit.scss
index d7129dbf3b64a88b600ff7a09da6aed9e5ad5ddc..c8cc6be5284b491e76f379b4d2873cc972a27109 100644 (file)
--- a/scss/util/_unit.scss
+++ b/scss/util/_unit.scss
@@ -8,8 +8,6 @@
 
 $global-font-size: 100% !default;
 
-// scss-lint:disable ZeroUnit
-
 /// Removes the unit (e.g. px, em, rem) from a value, returning the number only.
 ///
 /// @param {Number} $num - Number to strip unit from.