Merge branch 'v4-dev' into dropdown-keyboard

8 files changed, 34 insertions, 50 deletions

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index af74a55f1..d4c79ab60 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -79,12 +79,6 @@
   @include border-left-radius(0);
 }
 
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
 
 // Sizing
 //
@@ -119,8 +113,8 @@
 
 
 // The clickable button for toggling the menu
-// Remove the gradient and set the same inset shadow as the :active state
-.btn-group.open .dropdown-toggle {
+// Set the same inset shadow as the :active state
+.btn-group.show .dropdown-toggle {
   @include box-shadow($btn-active-box-shadow);
 
   // Show no shadow for `.btn-link` since it has no other button styles.
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/_carousel.scss b/scss/_carousel.scss
index 1b6e450ae..41eca949f 100644
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@ -12,13 +12,11 @@
 .carousel-item {
   position: relative;
   display: none;
+  align-items: center;
   width: 100%;
-
-  @include if-supports-3d-transforms() {
-    @include transition($carousel-transition);
-    backface-visibility: hidden;
-    perspective: 1000px;
-  }
+  @include transition($carousel-transition);
+  backface-visibility: hidden;
+  perspective: 1000px;
 }
 
 .carousel-item.active,
@@ -34,21 +32,19 @@
 }
 
 // CSS3 transforms when supported by the browser
-@include if-supports-3d-transforms() {
-  .carousel-item-next.carousel-item-left,
-  .carousel-item-prev.carousel-item-right {
-    transform: translate3d(0, 0, 0);
-  }
+.carousel-item-next.carousel-item-left,
+.carousel-item-prev.carousel-item-right {
+  transform: translate3d(0, 0, 0);
+}
 
-  .carousel-item-next,
-  .active.carousel-item-right {
-    transform: translate3d(100%, 0, 0);
-  }
+.carousel-item-next,
+.active.carousel-item-right {
+  transform: translate3d(100%, 0, 0);
+}
 
-  .carousel-item-prev,
-  .active.carousel-item-left {
-    transform: translate3d(-100%, 0, 0);
-  }
+.carousel-item-prev,
+.active.carousel-item-left {
+  transform: translate3d(-100%, 0, 0);
 }
 
 
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
index 13aad2487..cc3394f0a 100644
--- a/scss/_mixins.scss
+++ b/scss/_mixins.scss
@@ -14,7 +14,6 @@
 @import "mixins/text-emphasis";
 @import "mixins/text-hide";
 @import "mixins/text-truncate";
-@import "mixins/transforms";
 @import "mixins/visibility";
 
 // // Components
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 854e7df12..419d9263a 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -216,9 +216,9 @@
       }
     }
 
-    .open > .nav-link,
+    .show > .nav-link,
     .active > .nav-link,
-    .nav-link.open,
+    .nav-link.show,
     .nav-link.active {
       color: $navbar-light-active-color;
     }
@@ -261,9 +261,9 @@
       }
     }
 
-    .open > .nav-link,
+    .show > .nav-link,
     .active > .nav-link,
-    .nav-link.open,
+    .nav-link.show,
     .nav-link.active {
       color: $navbar-inverse-active-color;
     }
diff --git a/scss/_variables.scss b/scss/_variables.scss
index f517797fa..d277011b2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -904,7 +904,7 @@ $carousel-control-icon-width:                 20px !default;
 $carousel-control-prev-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), "#", "%23") !default;
 $carousel-control-next-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), "#", "%23") !default;
 
-$carousel-transition:           transform .6s ease-in-out !default;
+$carousel-transition:           transform .6s ease !default;
 
 
 // Close
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;
+  }
 }
 
 //
diff --git a/scss/mixins/_transforms.scss b/scss/mixins/_transforms.scss
deleted file mode 100644
index 4005c9d02..000000000
--- a/scss/mixins/_transforms.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Applies the given styles only when the browser support CSS3 3D transforms.
-@mixin if-supports-3d-transforms() {
-  @media (-webkit-transform-3d) {
-    // Old Safari, Old Android
-    // http://caniuse.com/#feat=css-featurequeries
-    // https://developer.mozilla.org/en-US/docs/Web/CSS/@media/-webkit-transform-3d
-    @content;
-  }
-
-  @supports (transform: translate3d(0,0,0)) {
-    // The Proper Way: Using a CSS feature query
-    @content;
-  }
-}