Merge branch 'v4-dev' into v4-grid-redux

6 files changed, 17 insertions, 5 deletions

diff --git a/docs/assets/scss/_ads.scss b/docs/assets/scss/_ads.scss
index 8876e5bfb..405cac30a 100644
--- a/docs/assets/scss/_ads.scss
+++ b/docs/assets/scss/_ads.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 //
 // Carbon ads
 //
diff --git a/docs/assets/scss/_callouts.scss b/docs/assets/scss/_callouts.scss
index 0ba52fd84..401bfd6f5 100644
--- a/docs/assets/scss/_callouts.scss
+++ b/docs/assets/scss/_callouts.scss
@@ -10,13 +10,16 @@
   border-left-width: .25rem;
   border-radius: .25rem;
 }
+
 .bd-callout h4 {
   margin-top: 0;
   margin-bottom: .25rem;
 }
+
 .bd-callout p:last-child {
   margin-bottom: 0;
 }
+
 .bd-callout code {
   border-radius: .25rem;
 }
@@ -31,6 +34,7 @@
 
   h4 { color: $color; }
 }
-.bd-callout-info    { @include bs-callout-variant($bd-info); }
+
+.bd-callout-info { @include bs-callout-variant($bd-info); }
 .bd-callout-warning { @include bs-callout-variant($bd-warning); }
-.bd-callout-danger  { @include bs-callout-variant($bd-danger); }
+.bd-callout-danger { @include bs-callout-variant($bd-danger); }
diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss
index 4e753dd04..28f4cd442 100644
--- a/docs/assets/scss/_content.scss
+++ b/docs/assets/scss/_content.scss
@@ -1,4 +1,4 @@
-// scss-lint:disable IdSelector
+// scss-lint:disable IdSelector, NestingDepth, SelectorDepth
 
 //
 // Automatically style Markdown-based tables like a Bootstrap `.table`.
diff --git a/docs/assets/scss/_masthead.scss b/docs/assets/scss/_masthead.scss
index efbd5c649..f0ebe9363 100644
--- a/docs/assets/scss/_masthead.scss
+++ b/docs/assets/scss/_masthead.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 .bd-masthead {
   position: relative;
   padding: 3rem ($grid-gutter-width / 2) 2rem;
diff --git a/docs/assets/scss/_page-header.scss b/docs/assets/scss/_page-header.scss
index 2934460a9..457d3fbef 100644
--- a/docs/assets/scss/_page-header.scss
+++ b/docs/assets/scss/_page-header.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 .bd-pageheader {
   padding: 2rem ($grid-gutter-width / 2);
   margin-bottom: 1.5rem;
diff --git a/docs/assets/scss/_responsive-tests.scss b/docs/assets/scss/_responsive-tests.scss
index 0bdd6632d..79fe721bb 100644
--- a/docs/assets/scss/_responsive-tests.scss
+++ b/docs/assets/scss/_responsive-tests.scss
@@ -1,3 +1,5 @@
+// scss-lint:disable ImportantRule
+
 //
 // Responsive tests
 //
@@ -20,11 +22,11 @@
 .responsive-utilities td {
   text-align: center;
 }
-.responsive-utilities td.is-visible {
+.responsive-utilities .is-visible {
   color: #468847;
   background-color: #dff0d8 !important;
 }
-.responsive-utilities td.is-hidden {
+.responsive-utilities .is-hidden {
   color: #ccc;
   background-color: #f9f9f9 !important;
 }