Merge branch 'v4-dev' into dropdown-keyboard

14 files changed, 8 insertions, 32 deletions

diff --git a/bower.json b/bower.json
index 510770926..cf339b7f1 100644
--- a/bower.json
+++ b/bower.json
@@ -25,6 +25,7 @@
     "composer.json",
     "CONTRIBUTING.md",
     "docs",
+    "Gruntfile.js",
     "js/tests",
     "test-infra"
   ],
diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index e75484316..d1606940a 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -28,7 +28,7 @@ Here's a carousel with slides only. Note the presence of the `.d-block` and `.im
 
 {% example html %}
 <div id="carouselExampleSlidesOnly" class="carousel slide" data-ride="carousel">
-  <div class="carousel-inner" role="listbox">
+  <div class="carousel-inner">
     <div class="carousel-item active">
       <img class="d-block w-100" data-src="holder.js/800x400?auto=yes&bg=777&fg=555&text=First slide" alt="First slide">
     </div>
@@ -48,7 +48,7 @@ Adding in the previous and next controls:
 
 {% example html %}
 <div id="carouselExampleControls" class="carousel slide" data-ride="carousel">
-  <div class="carousel-inner" role="listbox">
+  <div class="carousel-inner">
     <div class="carousel-item active">
       <img class="d-block w-100" data-src="holder.js/800x400?auto=yes&bg=777&fg=555&text=First slide" alt="First slide">
     </div>
@@ -81,7 +81,7 @@ You can also add the indicators to the carousel, alongside the controls, too.
     <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
     <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
   </ol>
-  <div class="carousel-inner" role="listbox">
+  <div class="carousel-inner">
     <div class="carousel-item active">
       <img class="d-block w-100" data-src="holder.js/800x400?auto=yes&bg=777&fg=555&text=First slide" alt="First slide">
     </div>
@@ -120,7 +120,7 @@ Add captions to your slides easily with the `.carousel-caption` element within a
       <li data-target="#carouselExampleCaptions" data-slide-to="1"></li>
       <li data-target="#carouselExampleCaptions" data-slide-to="2"></li>
     </ol>
-    <div class="carousel-inner" role="listbox">
+    <div class="carousel-inner">
       <div class="carousel-item active">
         <img class="d-block w-100" data-src="holder.js/800x400?auto=yes&bg=777&fg=555&text=First slide" alt="First slide">
         <div class="carousel-caption d-none d-md-block">
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index e746c5915..072129a61 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -47,7 +47,7 @@
         <li data-target="#myCarousel" data-slide-to="1"></li>
         <li data-target="#myCarousel" data-slide-to="2"></li>
       </ol>
-      <div class="carousel-inner" role="listbox">
+      <div class="carousel-inner">
         <div class="carousel-item active">
           <img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
           <div class="container">
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index ad249d874..8d71a97bd 100644
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@@ -18,7 +18,7 @@
           <li data-target="#carousel-example-generic" data-slide-to="1"></li>
           <li data-target="#carousel-example-generic" data-slide-to="2"></li>
         </ol>
-        <div class="carousel-inner" role="listbox">
+        <div class="carousel-inner">
           <div class="carousel-item active">
             <img src="https://37.media.tumblr.com/tumblr_m8tay0JcfG1qa42jro1_1280.jpg" alt="First slide">
           </div>
diff --git a/package.json b/package.json
index d11ffbf41..7d2f2d893 100644
--- a/package.json
+++ b/package.json
@@ -88,10 +88,8 @@
   },
   "files": [
     "dist",
-    "grunt",
     "js/**/*.js",
     "scss/**/*.scss",
-    "Gruntfile.js",
     "LICENSE"
   ],
   "jspm": {
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 4a8ffcbe5..8b669531f 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -28,7 +28,6 @@
   // Disabled comes first so active can properly restyle
   &.disabled,
   &:disabled {
-    cursor: $cursor-disabled;
     opacity: .65;
     @include box-shadow(none);
   }
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index d303c48d0..9133f7dbd 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -41,13 +41,11 @@
 
   &:disabled {
     ~ .custom-control-indicator {
-      cursor: $custom-control-disabled-cursor;
       background-color: $custom-control-disabled-indicator-bg;
     }
 
     ~ .custom-control-description {
       color: $custom-control-disabled-description-color;
-      cursor: $custom-control-disabled-cursor;
     }
   }
 }
@@ -165,7 +163,6 @@
 
   &:disabled {
     color: $custom-select-disabled-color;
-    cursor: $cursor-disabled;
     background-color: $custom-select-disabled-bg;
   }
 
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 090fdf1c1..116a84a3b 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -90,7 +90,6 @@
   &.disabled,
   &:disabled {
     color: $dropdown-link-disabled-color;
-    cursor: $cursor-disabled;
     background-color: transparent;
     // Remove CSS gradients if they're enabled
     @if $enable-gradients {
diff --git a/scss/_forms.scss b/scss/_forms.scss
index 11fa94a25..55e8cb43a 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -58,10 +58,6 @@
     // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
     opacity: 1;
   }
-
-  &:disabled {
-    cursor: $cursor-disabled;
-  }
 }
 
 select.form-control {
@@ -212,7 +208,6 @@ select.form-control-lg {
   &.disabled {
     .form-check-label {
       color: $text-muted;
-      cursor: $cursor-disabled;
     }
   }
 }
diff --git a/scss/_list-group.scss b/scss/_list-group.scss
index c4b5e2f92..c7172e4ff 100644
--- a/scss/_list-group.scss
+++ b/scss/_list-group.scss
@@ -65,7 +65,6 @@
   &.disabled,
   &:disabled {
     color: $list-group-disabled-color;
-    cursor: $cursor-disabled;
     background-color: $list-group-disabled-bg;
   }
 
diff --git a/scss/_nav.scss b/scss/_nav.scss
index 2b6b2a7f3..973679eee 100644
--- a/scss/_nav.scss
+++ b/scss/_nav.scss
@@ -19,10 +19,9 @@
     text-decoration: none;
   }
 
-  // Disabled state lightens text and removes hover/tab effects
+  // Disabled state lightens text
   &.disabled {
     color: $nav-disabled-link-color;
-    cursor: $cursor-disabled;
   }
 }
 
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 24aa028d1..4389e0f92 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -29,7 +29,6 @@
   &.disabled .page-link {
     color: $pagination-disabled-color;
     pointer-events: none;
-    cursor: $cursor-disabled; // While `pointer-events: none` removes the cursor in modern browsers, we provide a disabled cursor as a fallback.
     background-color: $pagination-disabled-bg;
     border-color: $pagination-disabled-border;
   }
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index c52e6f887..6a8c6ab37 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -368,13 +368,6 @@ input[type="radio"],
 input[type="checkbox"] {
   box-sizing: border-box; // 1. Add the correct box sizing in IE 10-
   padding: 0; // 2. Remove the padding in IE 10-
-
-  // Apply a disabled cursor for radios and checkboxes.
-  //
-  // Note: Neither radios nor checkboxes can be readonly.
-  &:disabled {
-    cursor: $cursor-disabled;
-  }
 }
 
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d277011b2..957e69d5c 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -433,8 +433,6 @@ $form-group-margin-bottom:       1rem !default;
 $input-group-addon-bg:           $gray-lighter !default;
 $input-group-addon-border-color: $input-border-color !default;
 
-$cursor-disabled:                not-allowed !default;
-
 $custom-control-gutter:   1.5rem !default;
 $custom-control-spacer-y: .25rem !default;
 $custom-control-spacer-x: 1rem !default;
@@ -444,7 +442,6 @@ $custom-control-indicator-bg:         #ddd !default;
 $custom-control-indicator-bg-size:    50% 50% !default;
 $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default;
 
-$custom-control-disabled-cursor:             $cursor-disabled !default;
 $custom-control-disabled-indicator-bg:       $gray-lighter !default;
 $custom-control-disabled-description-color:  $gray-light !default;