Merge branch 'main' into master-ysds-form-validations

.browserslistrc

@@ -5,9 +5,8 @@ last 1 major version
 not dead
 Chrome >= 60
 Firefox >= 60
-Edge >= 16.16299
+Edge >= 16
 iOS >= 10
 Safari >= 10
 Android >= 6
 not Explorer <= 11
-not ExplorerMobile <= 11

.bundlewatch.config.json

@@ -2,11 +2,11 @@
   "files": [
     {
       "path": "./dist/css/bootstrap-grid.css",
-      "maxSize": "7.2 kB"
+      "maxSize": "7 kB"
     },
     {
       "path": "./dist/css/bootstrap-grid.min.css",
-      "maxSize": "6.4 kB"
+      "maxSize": "6 kB"
     },
     {
       "path": "./dist/css/bootstrap-reboot.css",
@@ -18,27 +18,27 @@
     },
     {
       "path": "./dist/css/bootstrap-utilities.css",
-      "maxSize": "8 kB"
+      "maxSize": "7 kB"
     },
     {
       "path": "./dist/css/bootstrap-utilities.min.css",
-      "maxSize": "7 kB"
+      "maxSize": "6 kB"
     },
     {
       "path": "./dist/css/bootstrap.css",
-      "maxSize": "25 kB"
+      "maxSize": "24 kB"
     },
     {
       "path": "./dist/css/bootstrap.min.css",
-      "maxSize": "23 kB"
+      "maxSize": "21 kB"
     },
     {
       "path": "./dist/js/bootstrap.bundle.js",
       "maxSize": "51 kB"
     },
     {
       "path": "./dist/js/bootstrap.bundle.min.js",
-      "maxSize": "23 kB"
+      "maxSize": "22.5 kB"
     },
     {
       "path": "./dist/js/bootstrap.esm.js",
@@ -54,12 +54,12 @@
     },
     {
       "path": "./dist/js/bootstrap.min.js",
-      "maxSize": "16.5 kB"
+      "maxSize": "16 kB"
     }
   ],
   "ci": {
     "trackBranches": [
-      "master",
+      "main",
       "v4-dev"
     ]
   }

.gitattributes

@@ -1,18 +1,8 @@
 # Enforce Unix newlines
-*.css   text eol=lf
-*.html  text eol=lf
-*.js    text eol=lf
-*.json  text eol=lf
-*.md    text eol=lf
-*.scss  text eol=lf
-*.sh    text eol=lf
-*.svg   text eol=lf
-*.txt   text eol=lf
-*.xml   text eol=lf
-*.yml   text eol=lf
+* text=auto eol=lf
 
 # Don't diff or textually merge source maps
-*.map   binary
+*.map binary
 
 bootstrap.css linguist-vendored=false
 bootstrap.js linguist-vendored=false

.github/CONTRIBUTING.md

@@ -19,7 +19,7 @@ and [submitting pull requests](#pull-requests), but please respect the following
 restrictions:
 
 * Please **do not** use the issue tracker for personal support requests.  Stack
-  Overflow ([`bootstrap-4`](https://stackoverflow.com/questions/tagged/bootstrap-4) tag),
+  Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag),
   [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](README.md#community) are better places to get help.
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
@@ -65,7 +65,7 @@ Guidelines for bug reports:
    reported.
 
 2. **Check if the issue has been fixed** — try to reproduce it using the
-   latest `master` or development branch in the repository.
+   latest `main` (or `v4-dev` branch if the issue is about v4) in the repository.
 
 3. **Isolate the problem** — ideally create a [reduced test
    case](https://css-tricks.com/reduced-test-cases/) and a live example.
@@ -134,12 +134,12 @@ project (indentation, accurate comments, etc.) and any other requirements
 
 **Do not edit `bootstrap.css`, or `bootstrap.js`
 directly!** Those files are automatically generated. You should edit the
-source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/master/scss)
-and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/master/js/src) instead.
+source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/main/scss)
+and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/main/js/src) instead.
 
 Similarly, when contributing to Bootstrap's documentation, you should edit the
 documentation source files in
-[the `/bootstrap/site/content/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/site/content/docs).
+[the `/bootstrap/site/content/docs/` directory of the `main` branch](https://github.com/twbs/bootstrap/tree/main/site/content/docs).
 **Do not edit the `gh-pages` branch.** That branch is generated from the
 documentation source files and is managed separately by the Bootstrap Core Team.
 
@@ -161,8 +161,8 @@ included in the project:
 2. If you cloned a while ago, get the latest changes from upstream:
 
    ```bash
-   git checkout master
-   git pull upstream master
+   git checkout main
+   git pull upstream main
    ```
 
 3. Create a new topic branch (off the main project development branch) to
@@ -181,7 +181,7 @@ included in the project:
 5. Locally merge (or rebase) the upstream development branch into your topic branch:
 
    ```bash
-   git pull [--rebase] upstream master
+   git pull [--rebase] upstream main
    ```
 
 6. Push your topic branch up to your fork:
@@ -191,7 +191,7 @@ included in the project:
    ```
 
 7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
-    with a clear title and description against the `master` branch.
+    with a clear title and description against the `main` branch.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
 license your work under the terms of the [MIT License](../LICENSE) (if it

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,17 +1,20 @@
 ---
 name: Bug report
 about: Tell us about a bug you may have identified in Bootstrap.
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
 Before opening:
 
 - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- [Validate](https://html5.validator.nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems
-- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md)
+- [Validate](https://html5.validator.nu/) any HTML to avoid common problems
+- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md)
 
 Bug reports must include:
 
 - Operating system and version (Windows, macOS, Android, iOS)
 - Browser and version (Chrome, Firefox, Safari, Microsoft Edge, Opera, Android Browser)
-- [Reduced test case](https://css-tricks.com/reduced-test-cases/) and suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)
+- A [reduced test case](https://css-tricks.com/reduced-test-cases/) or suggested fix using [CodePen](https://codepen.io/) or [JS Bin](https://jsbin.com/)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,13 +1,16 @@
 ---
 name: Feature request
 about: Suggest an idea for a new feature in Bootstrap.
+title: ''
+labels: feature
+assignees: ''
 
 ---
 
 Before opening:
 
 - [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue)
-- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md)
+- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md)
 
 Feature requests must include:
 

.github/SUPPORT.md

@@ -8,4 +8,4 @@ For general troubleshooting or help getting started:
 
 - Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
 - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
-- Ask and explore Stack Overflow with the [`bootstrap-4`](https://stackoverflow.com/questions/tagged/bootstrap-4) tag.
+- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.

.github/workflows/bundlewatch.yml

@@ -36,3 +36,4 @@ jobs:
         run: npm run bundlewatch
         env:
           BUNDLEWATCH_GITHUB_TOKEN: "${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}"
+          CI_BRANCH_BASE: main

.github/workflows/release-notes.yml

@@ -3,7 +3,7 @@ name: Release notes
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   update_release_draft: