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

Gemfile

 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.1.0'
+  gem 'jekyll', '~> 3.1.1'
   gem 'jekyll-redirect-from', '~> 0.9.1'
   gem 'jekyll-sitemap', '~> 0.10.0'
   gem 'sass', '~> 3.4.21'

Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     colorator (0.1)
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
-    jekyll (3.1.0)
+    jekyll (3.1.1)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -28,7 +28,7 @@ GEM
     mercenary (0.3.5)
     rake (10.5.0)
     rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.6)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
@@ -42,7 +42,7 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
-  jekyll (~> 3.1.0)
+  jekyll (~> 3.1.1)
   jekyll-redirect-from (~> 0.9.1)
   jekyll-sitemap (~> 0.10.0)
   sass (~> 3.4.21)

docs/assets/scss/_ads.scss

+// scss-lint:disable ImportantRule
+
 //
 // Carbon ads
 //

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); }

docs/assets/scss/_content.scss

-// scss-lint:disable IdSelector
+// scss-lint:disable IdSelector, NestingDepth, SelectorDepth
 
 //
 // Automatically style Markdown-based tables like a Bootstrap `.table`.

docs/assets/scss/_masthead.scss

+// scss-lint:disable ImportantRule
+
 .bd-masthead {
   position: relative;
   padding: 3rem ($grid-gutter-width / 2) 2rem;

docs/assets/scss/_page-header.scss

+// scss-lint:disable ImportantRule
+
 .bd-pageheader {
   padding: 2rem ($grid-gutter-width / 2);
   margin-bottom: 1.5rem;

docs/assets/scss/_responsive-tests.scss

+// 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;
 }

package.json

@@ -42,7 +42,7 @@
     "grunt-contrib-connect": "~0.11.2",
     "grunt-contrib-copy": "~0.8.1",
     "grunt-contrib-cssmin": "~0.14.0",
-    "grunt-contrib-qunit": "~0.7.0",
+    "grunt-contrib-qunit": "~1.0.1",
     "grunt-contrib-sass": "^0.9.2",
     "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.6.1",
@@ -51,7 +51,7 @@
     "grunt-exec": "~0.4.6",
     "grunt-html": "~5.0.0",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~2.6.0",
+    "grunt-jscs": "~2.7.0",
     "grunt-line-remover": "0.0.2",
     "grunt-postcss": "^0.7.0",
     "grunt-sass": "^1.0.0",
@@ -63,7 +63,7 @@
     "markdown-it": "^5.0.0",
     "mq4-hover-shim": "^0.3.0",
     "npm-shrinkwrap": "^200.1.0",
-    "shelljs": "^0.5.3",
+    "shelljs": "^0.6.0",
     "time-grunt": "^1.2.1"
   },
   "engines": {

scss/_button-group.scss

+// scss-lint:disable QualifyingElement
+
 // Make the div behave like a button
 .btn-group,
 .btn-group-vertical {

scss/_buttons.scss

+// scss-lint:disable QualifyingElement
+
 //
 // Base styles
 //

scss/_close.scss

@@ -19,6 +19,8 @@
 // iOS requires the button element instead of an anchor tag.
 // If you want the anchor version, it requires `href="#"`.
 // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+
+// scss-lint:disable QualifyingElement
 button.close {
   padding: 0;
   cursor: pointer;
@@ -26,3 +28,4 @@ button.close {
   border: 0;
   -webkit-appearance: none;
 }
+// scss-lint:enable QualifyingElement

scss/_forms.scss

+// scss-lint:disable QualifyingElement
+
 //
 // Textual form controls
 //

scss/_input-group.scss

@@ -107,11 +107,13 @@
     @include border-radius($border-radius-lg);
   }
 
+  // scss-lint:disable QualifyingElement
   // Nuke default margins from checkboxes and radios to vertically center within.
   input[type="radio"],
   input[type="checkbox"] {
     margin-top: 0;
   }
+  // scss-lint:enable QualifyingElement
 }
 
 

scss/_labels.scss

@@ -27,6 +27,7 @@
   top: -1px;
 }
 
+// scss-lint:disable QualifyingElement
 // Add hover effects, but only for links
 a.label {
   @include hover-focus {
@@ -35,6 +36,7 @@ a.label {
     cursor: pointer;
   }
 }
+// scss-lint:enable QualifyingElement
 
 // Pill labels
 //

scss/_list-group.scss

@@ -44,6 +44,7 @@
 // Use anchor or button elements instead of `li`s or `div`s to create interactive
 // list items. Includes an extra `.active` modifier class for selected items.
 
+// scss-lint:disable QualifyingElement
 a.list-group-item,
 button.list-group-item {
   width: 100%;
@@ -61,6 +62,7 @@ button.list-group-item {
     background-color: $list-group-hover-bg;
   }
 }
+// scss-lint:enable QualifyingElement
 
 .list-group-item {
   // Disabled state

scss/_navbar.scss

@@ -117,6 +117,7 @@
   }
 }
 
+// scss-lint:disable ImportantRule
 // Custom override for
 .navbar-toggleable {
   &-xs {
@@ -135,6 +136,7 @@
     }
   }
 }
+// scss-lint:enable ImportantRule
 
 
 // Navigation

scss/_print.scss

+// scss-lint:disable ImportantRule, QualifyingElement
+
 // Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css
 
 // ==========================================================================