aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-09-04 17:58:20 -0700
committerGitHub <[email protected]>2016-09-04 17:58:20 -0700
commitdc5c1421c6ee793bb8b5feced401472de806c70c (patch)
tree458c868f31249fd70f0670481e67c2ce38c4473f
parent9c720285b5b2abce4d57c802701f101f81485ca0 (diff)
downloadbootstrap-dc5c1421c6ee793bb8b5feced401472de806c70c.tar.xz
bootstrap-dc5c1421c6ee793bb8b5feced401472de806c70c.zip
Disable important flag on Sass linter (#20627)
-rw-r--r--scss/.scss-lint.yml2
-rw-r--r--scss/_navbar.scss2
-rw-r--r--scss/_print.scss2
-rw-r--r--scss/_reboot.scss2
-rw-r--r--scss/_tables.scss2
-rw-r--r--scss/utilities/_visibility.scss2
6 files changed, 3 insertions, 9 deletions
diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml
index 66c63335c..65c365ddb 100644
--- a/scss/.scss-lint.yml
+++ b/scss/.scss-lint.yml
@@ -89,7 +89,7 @@ linters:
enabled: true
ImportantRule:
- enabled: true
+ enabled: false
ImportPath:
enabled: true
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 8d8352c73..881af0db6 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -214,7 +214,6 @@
//
// Custom override for collapse plugin in navbar.
-// scss-lint:disable ImportantRule
.navbar-toggleable {
&-xs {
@include clearfix;
@@ -255,4 +254,3 @@
}
}
}
-// scss-lint:enable ImportantRule
diff --git a/scss/_print.scss b/scss/_print.scss
index b2c93735c..84556602f 100644
--- a/scss/_print.scss
+++ b/scss/_print.scss
@@ -1,4 +1,4 @@
-// scss-lint:disable ImportantRule, QualifyingElement
+// scss-lint:disable QualifyingElement
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 02c579d32..1a1e4728b 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -1,4 +1,4 @@
-// scss-lint:disable ImportantRule, QualifyingElement, DuplicateProperty
+// scss-lint:disable QualifyingElement, DuplicateProperty
// Reboot
//
diff --git a/scss/_tables.scss b/scss/_tables.scss
index 342c788c9..235ec984e 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -184,7 +184,6 @@
}
}
- // scss-lint:disable ImportantRule
tr {
float: left;
@@ -194,5 +193,4 @@
border: $table-border-width solid $table-border-color;
}
}
- // scss-lint:enable ImportantRule
}
diff --git a/scss/utilities/_visibility.scss b/scss/utilities/_visibility.scss
index 63891677e..cdb142869 100644
--- a/scss/utilities/_visibility.scss
+++ b/scss/utilities/_visibility.scss
@@ -1,5 +1,3 @@
-// scss-lint:disable ImportantRule
-
//
// Visibility utilities
//