Merge branch 'v4-dev' into btn-active

scss/_button-group.scss

@@ -152,14 +152,14 @@
     &:not(:first-child):not(:last-child) {
       border-radius: 0;
     }
-  }
 
-  &:first-child:not(:last-child) {
-    @include border-bottom-radius(0);
-  }
+    &:first-child:not(:last-child) {
+      @include border-bottom-radius(0);
+    }
 
-  &:last-child:not(:first-child) {
-    @include border-top-radius(0);
+    &:last-child:not(:first-child) {
+      @include border-top-radius(0);
+    }
   }
 
   > .btn-group:not(:first-child):not(:last-child) > .btn {

scss/_card.scss

@@ -207,7 +207,7 @@
           }
         }
 
-        &:not(:first-child):not(:last-child) {
+        &:not(:first-child):not(:last-child):not(:only-child) {
           border-radius: 0;
 
           .card-img-top,
@@ -215,6 +215,10 @@
             border-radius: 0;
           }
         }
+
+        &:only-child {
+          @include border-radius($card-border-radius);
+        }
       }
     }
   }

scss/_functions.scss

@@ -80,11 +80,7 @@
 @function theme-color-level($color-name: "primary", $level: 0) {
   $color: theme-color($color-name);
   $color-base: if($level > 0, #000, #fff);
+  $level: abs($level);
 
-  @if $level < 0 {
-    // Lighter values need a quick double negative for the Sass math to work
-    @return mix($color-base, $color, $level * -1 * $theme-color-interval);
-  } @else {
-    @return mix($color-base, $color, $level * $theme-color-interval);
-  }
+  @return mix($color-base, $color, $level * $theme-color-interval);
 }

scss/_navbar.scss

@@ -98,6 +98,7 @@
 // on the `.navbar` parent.
 .navbar-collapse {
   flex-basis: 100%;
+  flex-grow: 1;
   // For always expanded or extra full navbars, ensure content aligns itself
   // properly vertically. Can be easily overridden with flex utilities.
   align-items: center;
@@ -146,8 +147,7 @@
       }
 
       @include media-breakpoint-up($next) {
-        flex-direction: row;
-        flex-wrap: nowrap;
+        flex-flow: row nowrap;
         justify-content: flex-start;
 
         .navbar-nav {
@@ -177,6 +177,9 @@
         // scss-lint:disable ImportantRule
         .navbar-collapse {
           display: flex !important;
+
+          // Changes flex-bases to auto because of an IE10 bug
+          flex-basis: auto;
         }
         // scss-lint:enable ImportantRule
 

scss/_reboot.scss

@@ -273,7 +273,7 @@ svg:not(:root) {
 // However, they DO support removing the click delay via `touch-action: manipulation`.
 // See:
 // * https://getbootstrap.com/docs/4.0/content/reboot/#click-delay-optimization-for-touch
-// * http://caniuse.com/#feat=css-touch-action
+// * https://caniuse.com/#feat=css-touch-action
 // * https://patrickhlauke.github.io/touch/tests/results/#suppressing-300ms-delay
 
 a,

scss/_variables.scss

@@ -407,8 +407,8 @@ $custom-radio-indicator-border-radius: 50% !default;
 $custom-radio-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
 
 $custom-select-padding-y:          .375rem !default;
-$custom-select-padding-x:          .75rem  !default;
-$custom-select-height:              $input-height  !default;
+$custom-select-padding-x:          .75rem !default;
+$custom-select-height:              $input-height !default;
 $custom-select-indicator-padding:   1rem !default; // Extra padding to account for the presence of the background-image based indicator
 $custom-select-line-height:         $input-btn-line-height !default;
 $custom-select-color:               $input-color !default;

scss/mixins/_grid-framework.scss

@@ -10,7 +10,7 @@
     width: 100%;
     min-height: 1px; // Prevent columns from collapsing when empty
     padding-right: ($gutter / 2);
-    padding-left:  ($gutter / 2);
+    padding-left: ($gutter / 2);
   }
 
   @each $breakpoint in map-keys($breakpoints) {
@@ -56,7 +56,7 @@
       @for $i from 0 through ($columns - 1) {
         @if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0
           .offset#{$infix}-#{$i} {
-            @include make-col-offset($i, $columns)
+            @include make-col-offset($i, $columns);
           }
         }
       }

scss/mixins/_grid.scss

@@ -7,7 +7,7 @@
   margin-right: auto;
   margin-left: auto;
   padding-right: ($grid-gutter-width / 2);
-  padding-left:  ($grid-gutter-width / 2);
+  padding-left: ($grid-gutter-width / 2);
 }
 
 
@@ -24,7 +24,7 @@
   display: flex;
   flex-wrap: wrap;
   margin-right: ($grid-gutter-width / -2);
-  margin-left:  ($grid-gutter-width / -2);
+  margin-left: ($grid-gutter-width / -2);
 }
 
 @mixin make-col-ready() {
@@ -35,7 +35,7 @@
   width: 100%;
   min-height: 1px; // Prevent collapsing
   padding-right: ($grid-gutter-width / 2);
-  padding-left:  ($grid-gutter-width / 2);
+  padding-left: ($grid-gutter-width / 2);
 }
 
 @mixin make-col($size, $columns: $grid-columns) {

scss/mixins/_hover.scss

@@ -9,7 +9,7 @@
 //  }
 //  @else {
 // scss-lint:disable Indentation
-    &:hover { @content }
+    &:hover { @content; }
 // scss-lint:enable Indentation
 //  }
 }
@@ -17,12 +17,14 @@
 
 @mixin hover-focus {
   @if $enable-hover-media-query {
-    &:focus { @content }
-    @include hover { @content }
+    &:focus {
+      @content;
+    }
+    @include hover { @content; }
   } @else {
     &:focus,
     &:hover {
-      @content
+      @content;
     }
   }
 }
@@ -31,14 +33,14 @@
   @if $enable-hover-media-query {
     &,
     &:focus {
-      @content
+      @content;
     }
-    @include hover { @content }
+    @include hover { @content; }
   } @else {
     &,
     &:focus,
     &:hover {
-      @content
+      @content;
     }
   }
 }
@@ -47,14 +49,14 @@
   @if $enable-hover-media-query {
     &:focus,
     &:active {
-      @content
+      @content;
     }
-    @include hover { @content }
+    @include hover { @content; }
   } @else {
     &:focus,
     &:active,
     &:hover {
-      @content
+      @content;
     }
   }
 }

scss/mixins/_image.scss

@@ -26,7 +26,7 @@
   // Autoprefixer takes care of adding -webkit-min-device-pixel-ratio and -o-min-device-pixel-ratio,
   // but doesn't convert dppx=>dpi.
   // There's no such thing as unprefixed min-device-pixel-ratio since it's nonstandard.
-  // Compatibility info: http://caniuse.com/#feat=css-media-resolution
+  // Compatibility info: https://caniuse.com/#feat=css-media-resolution
   @media
   only screen and (min-resolution: 192dpi), // IE9-11 don't support dppx
   only screen and (min-resolution: 2dppx) { // Standardized

scss/mixins/_screen-reader.scss

@@ -1,7 +1,7 @@
 // Only display content to screen readers
 //
-// See: http://a11yproject.com/posts/how-to-hide-content
-// See: http://hugogiraudel.com/2016/10/13/css-hide-and-seek/
+// See: http://a11yproject.com/posts/how-to-hide-content/
+// See: https://hugogiraudel.com/2016/10/13/css-hide-and-seek/
 
 @mixin sr-only {
   position: absolute;

scss/utilities/_background.scss

@@ -2,5 +2,10 @@
   @include bg-variant('.bg-#{$color}', $value);
 }
 
-.bg-white { background-color: $white !important; }
-.bg-transparent { background-color: transparent !important; }
+.bg-white {
+  background-color: $white !important;
+}
+
+.bg-transparent {
+  background-color: transparent !important;
+}