Merge branch 'master' into master-mc-drop-input-group-prepend-appends

package.json

@@ -91,26 +91,26 @@
     "popper.js": "^1.16.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.7",
-    "@babel/core": "^7.7.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
-    "@babel/preset-env": "^7.7.7",
+    "@babel/cli": "^7.8.3",
+    "@babel/core": "^7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+    "@babel/preset-env": "^7.8.3",
     "@rollup/plugin-commonjs": "^11.0.1",
     "@rollup/plugin-node-resolve": "^7.0.0",
-    "autoprefixer": "^9.7.3",
+    "autoprefixer": "^9.7.4",
     "babel-eslint": "^10.0.3",
     "babel-plugin-istanbul": "^6.0.0",
     "bundlesize": "^0.18.0",
     "clean-css-cli": "^4.3.0",
-    "cross-env": "^6.0.3",
+    "cross-env": "^7.0.0",
     "eslint": "^6.8.0",
     "eslint-config-xo": "^0.27.2",
     "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-unicorn": "^15.0.1",
-    "find-unused-sass-variables": "^1.0.4",
+    "find-unused-sass-variables": "^1.0.5",
     "glob": "^7.1.6",
     "hammer-simulator": "0.0.1",
-    "hugo-bin": "^0.50.2",
+    "hugo-bin": "^0.51.2",
     "ip": "^1.1.5",
     "karma": "^4.4.1",
     "karma-browserstack-launcher": "1.4.0",
@@ -120,22 +120,22 @@
     "karma-firefox-launcher": "^1.3.0",
     "karma-jasmine": "^3.1.0",
     "karma-jasmine-html-reporter": "^1.5.1",
-    "karma-rollup-preprocessor": "^7.0.2",
+    "karma-rollup-preprocessor": "^7.0.3",
     "linkinator": "^1.8.2",
-    "lockfile-lint": "^3.0.5",
-    "node-sass": "^4.13.0",
+    "lockfile-lint": "^3.0.9",
+    "node-sass": "^4.13.1",
     "nodemon": "^2.0.2",
     "npm-run-all": "^4.1.5",
     "popper.js": "^1.16.0",
     "postcss-cli": "^7.1.0",
-    "rollup": "^1.29.0",
+    "rollup": "^1.30.1",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-istanbul": "^2.0.1",
     "serve": "^11.3.0",
     "shelljs": "^0.8.3",
-    "stylelint": "^12.0.1",
-    "stylelint-config-twbs-bootstrap": "^1.1.0",
-    "terser": "^4.6.2",
+    "stylelint": "^13.0.0",
+    "stylelint-config-twbs-bootstrap": "^2.0.0",
+    "terser": "^4.6.3",
     "vnu-jar": "20.1.2"
   },
   "files": [

scss/_navbar.scss

@@ -121,10 +121,16 @@
   background-color: transparent; // remove default button style
   border: $border-width solid transparent; // remove default button style
   @include border-radius($navbar-toggler-border-radius);
+  @include transition($navbar-toggler-transition);
+
+  &:hover {
+    text-decoration: none;
+  }
 
-  &:hover,
   &:focus {
     text-decoration: none;
+    outline: 0;
+    box-shadow: 0 0 0 $navbar-toggler-focus-width;
   }
 }
 

scss/_variables.scss

@@ -851,15 +851,17 @@ $navbar-toggler-padding-y:          .25rem !default;
 $navbar-toggler-padding-x:          .75rem !default;
 $navbar-toggler-font-size:          $font-size-lg !default;
 $navbar-toggler-border-radius:      $btn-border-radius !default;
+$navbar-toggler-focus-width:        $btn-focus-width !default;
+$navbar-toggler-transition:         box-shadow .15s ease-in-out !default;
 
-$navbar-dark-color:                 rgba($white, .5) !default;
+$navbar-dark-color:                 rgba($white, .55) !default;
 $navbar-dark-hover-color:           rgba($white, .75) !default;
 $navbar-dark-active-color:          $white !default;
 $navbar-dark-disabled-color:        rgba($white, .25) !default;
 $navbar-dark-toggler-icon-bg:       url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'><path stroke='#{$navbar-dark-color}' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/></svg>") !default;
 $navbar-dark-toggler-border-color:  rgba($white, .1) !default;
 
-$navbar-light-color:                rgba($black, .5) !default;
+$navbar-light-color:                rgba($black, .55) !default;
 $navbar-light-hover-color:          rgba($black, .7) !default;
 $navbar-light-active-color:         rgba($black, .9) !default;
 $navbar-light-disabled-color:       rgba($black, .3) !default;

scss/forms/_input-group.scss

@@ -13,7 +13,8 @@
   > .form-select,
   > .form-file {
     position: relative; // For focus state's z-index
-    flex: 1 1 0%;
+    flex: 1 1 auto;
+    width: 1%;
     min-width: 0; // https://stackoverflow.com/questions/36247140/why-dont-flex-items-shrink-past-content-size
   }
 

scss/mixins/_grid-framework.scss

@@ -31,6 +31,7 @@
       .col#{$infix} {
         flex-basis: 0;
         flex-grow: 1;
+        min-width: 0; // See https://github.com/twbs/bootstrap/issues/25410
         max-width: 100%;
       }
 

site/assets/scss/docs.scss

@@ -51,17 +51,3 @@
 @import "syntax";
 @import "anchor";
 @import "algolia";
-
-// Temp
-.booticons-list {
-  .booticon {
-    display: inline;
-    width: 4rem;
-    padding: 1rem;
-    margin-right: 1rem;
-    margin-bottom: 1rem;
-    background-color: $white;
-    border: 1px solid rgba(0, 0, 0, .1);
-    @include border-radius(.25rem);
-  }
-}

site/content/docs/4.3/about/license.md

@@ -7,26 +7,26 @@ group: about
 
 Bootstrap is released under the MIT license and is copyright {{< year >}} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.
 
-#### It requires you to:
+## It requires you to:
 
 * Keep the license and copyright notice included in Bootstrap's CSS and JavaScript files when you use them in your works
 
-#### It permits you to:
+## It permits you to:
 
 - Freely download and use Bootstrap, in whole or in part, for personal, private, company internal, or commercial purposes
 - Use Bootstrap in packages or distributions that you create
 - Modify the source code
 - Grant a sublicense to modify and distribute Bootstrap to third parties not included in the license
 
-#### It forbids you to:
+## It forbids you to:
 
 - Hold the authors and license owners liable for damages as Bootstrap is provided without warranty
 - Hold the creators or copyright holders of Bootstrap liable
 - Redistribute any piece of Bootstrap without proper attribution
 - Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
 - Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question
 
-#### It does not require you to:
+## It does not require you to:
 
 - Include the source of Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it
 - Submit changes that you make to Bootstrap back to the Bootstrap project (though such feedback is encouraged)

site/content/docs/4.3/examples/blog/index.html

@@ -2,7 +2,7 @@
 layout: examples
 title: Blog Template
 extra_css:
-  - "https://fonts.googleapis.com/css?family=Playfair+Display:700,900"
+  - "https://fonts.googleapis.com/css?family=Playfair+Display:700,900&display=swap"
   - "blog.css"
 include_js: false
 ---

site/content/docs/4.3/examples/dashboard/index.html

@@ -6,8 +6,8 @@
 extra_js:
   - src: "https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.24.1/feather.min.js"
     integrity: "sha384-EbSscX4STvYAC/DxHse8z5gEDaNiKAIGW+EpfzYTfQrgIlHywXXrM9SUIZ0BlyfF"
-  - src: "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js"
-    integrity: "sha384-QzN1ywg2QLsf72ZkgRHgjkB/cfI4Dqjg6RJYQUqH6Wm8qp/MvmEYn+2NBsLnhLkr"
+  - src: "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"
+    integrity: "sha384-i+dHPTzZw7YVZOx9lbH5l6lP74sLRtMtwN2XjVqjf3uAGAREAF4LMIUDTWEVs4LI"
   - src: "dashboard.js"
 ---
 

site/content/docs/4.3/forms/validation.md

@@ -297,7 +297,10 @@ Validation styles are available for the following form controls and components:
 
   <div class="form-file">
     <input type="file" class="form-file-input" id="validationFormFile" required>
-    <label class="form-file-label" for="validationFormFile">Choose file...</label>
+    <label class="form-file-label" for="validationFormFile">
+      <span class="form-file-text">Choose file...</span>
+      <span class="form-file-button">Browse</span>
+    </label>
     <div class="invalid-feedback">Example invalid form file feedback</div>
   </div>
 </form>

site/content/docs/4.3/getting-started/theming.md

@@ -280,7 +280,7 @@ Many of Bootstrap's various components and utilities are built through a series
 
 ### All colors
 
-All colors available in Bootstrap 5, are available as Sass variables and a Sass map in `scss/_variables.scss` file. To avoid increased file sizes, we do not create classes for each of these variables.
+All colors available in Bootstrap 5 are available as Sass variables and as a Sass map in `scss/_variables.scss`. To avoid increased file sizes, we do not create classes for each of these variables.
 
 Sass cannot programmatically generate variables, so we must manually create them ourselves. We specify the midpoint value (`500`) and use custom color functions to tint (lighten) or shade (darken) our colors via Sass's `mix()` color function. Using `mix()` is not the same as `lighten()` and `darken()`—the former blends the specified color with white or black, while the latter only adjusts the lightness value of each color. The result is a much more complete suite of colors, as [shown in this CodePen demo](https://codepen.io/emdeoh/pen/zYOQOPB).