Merge branch 'v4-dev' into form-tweaks

12 files changed, 14 insertions, 39 deletions

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/_card.scss b/scss/_card.scss
index 2c74c0c97..67d4ebf1f 100644
--- a/scss/_card.scss
+++ b/scss/_card.scss
@@ -262,15 +262,18 @@
 // Columns
 //
 
-@include media-breakpoint-up(sm) {
-  .card-columns {
+.card-columns {
+  .card {
+    margin-bottom: $card-columns-margin;
+  }
+
+  @include media-breakpoint-up(sm) {
     column-count: $card-columns-count;
     column-gap: $card-columns-gap;
 
     .card {
       display: inline-block; // Don't let them vertically span multiple columns
       width: 100%; // Don't let their width change
-      margin-bottom: $card-columns-margin;
     }
   }
 }
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index 7ad68bb85..97c36472a 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;
     }
   }
 }
@@ -169,7 +167,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..3c5a5c66e 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 {
@@ -136,16 +135,6 @@
   white-space: nowrap; // as with > li > a
 }
 
-// Backdrop to catch body clicks on mobile, etc.
-.dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: $zindex-dropdown-backdrop;
-}
-
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
 //
 // Just add .dropup after the standard .dropdown class and you're set.
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/_popover.scss b/scss/_popover.scss
index 82a335fa1..c259916d7 100644
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -86,7 +86,7 @@
     &::after {
       top: -($popover-arrow-outer-width - 1);
       margin-left: -$popover-arrow-width;
-      border-bottom-color: $popover-title-bg;
+      border-bottom-color: $popover-arrow-color;
     }
 
     // This will remove the popover-title's border just below the arrow
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 faea8306a..105073542 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;
 
@@ -558,7 +555,6 @@ $dropdown-header-color:          $gray-light !default;
 // Warning: Avoid customizing these values. They're used for a bird's eye view
 // of components dependent on the z-axis and are designed to all work together.
 
-$zindex-dropdown-backdrop:  990 !default;
 $zindex-dropdown:           1000 !default;
 $zindex-sticky:             1020 !default;
 $zindex-fixed:              1030 !default;
diff --git a/scss/mixins/_cards.scss b/scss/mixins/_cards.scss
index 4b1232d8b..e535b316d 100644
--- a/scss/mixins/_cards.scss
+++ b/scss/mixins/_cards.scss
@@ -13,6 +13,12 @@
 @mixin card-outline-variant($color) {
   background-color: transparent;
   border-color: $color;
+
+  .card-header,
+  .card-footer {
+    background-color: transparent;
+    border-color: $color;
+  }
 }
 
 //