diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
index eecba088d3..e12dda9181 100644
--- a/.bundlewatch.config.json
+++ b/.bundlewatch.config.json
@@ -43,7 +43,7 @@
],
"ci": {
"trackBranches": [
- "master",
+ "main",
"v4-dev"
]
}
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 6cd59b59bf..2519be0d82 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -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 `master` or `v4-dev` branch in the repository.
3. **Isolate the problem** — ideally create a [reduced test
case](https://css-tricks.com/reduced-test-cases/) and a live example.
@@ -135,12 +135,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/v4-dev/scss)
+and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/v4-dev/js/src) instead.
Similarly, when contributing to Bootstrap's documentation, you should edit the
documentation source files in
-[the `/bootstrap/site/docs/` directory of the `master` branch](https://github.com/twbs/bootstrap/tree/master/site/docs).
+[the `/bootstrap/site/docs/` directory of the `v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev/site/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.
@@ -162,8 +162,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 v4-dev
+ git pull upstream v4-dev
```
3. Create a new topic branch (off the main project development branch) to
@@ -182,7 +182,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 v4-dev
```
6. Push your topic branch up to your fork:
@@ -192,7 +192,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 `v4-dev` 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
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 8971d44adb..ac25e06304 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -2,7 +2,7 @@ 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)
+- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md)
Bug reports must include:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2d77bb50ef..78f37806c5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ 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)
+- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md)
Bug reports must include:
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 4c13c86a5c..6ab3e96240 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,7 +1,7 @@
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/v4-dev/.github/CONTRIBUTING.md)
Feature requests must include:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ed71d397de..576a2d94ce 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ about: Suggest an idea for a new feature in Bootstrap.
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/v4-dev/.github/CONTRIBUTING.md)
Feature requests must include:
diff --git a/README.md b/README.md
index 02f7db0968..1f9c8a8162 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified
## Bugs and feature requests
-Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
+Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
## Documentation
@@ -133,11 +133,11 @@ You can find all our previous releases docs on .
+Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/v4-dev/.editorconfig) for easy use in common text editors. Read more and download plugins at .
## Community
@@ -206,4 +206,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
## Copyright and license
-Code and documentation copyright 2011-2020 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Code and documentation copyright 2011-2020 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
diff --git a/build/banner.js b/build/banner.js
index 453fc3b6e0..df82ff32ed 100644
--- a/build/banner.js
+++ b/build/banner.js
@@ -7,7 +7,7 @@ function getBanner(pluginFilename) {
return `/*!
* Bootstrap${pluginFilename ? ` ${pluginFilename}` : ''} v${pkg.version} (${pkg.homepage})
* Copyright 2011-${year} ${pkg.author}
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/`
}
diff --git a/build/build-plugins.js b/build/build-plugins.js
index 00ae91d5dd..3829bb294c 100644
--- a/build/build-plugins.js
+++ b/build/build-plugins.js
@@ -4,7 +4,7 @@
* Script to build our plugins to use them separately.
* Copyright 2020 The Bootstrap Authors
* Copyright 2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
diff --git a/build/change-version.js b/build/change-version.js
index ec3c77857a..d1131237c1 100755
--- a/build/change-version.js
+++ b/build/change-version.js
@@ -4,7 +4,7 @@
* Script to update version number references in the project.
* Copyright 2017-2020 The Bootstrap Authors
* Copyright 2017-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
diff --git a/build/generate-sri.js b/build/generate-sri.js
index ca2920ef27..d340b5378f 100644
--- a/build/generate-sri.js
+++ b/build/generate-sri.js
@@ -7,7 +7,7 @@
*
* Copyright 2017-2020 The Bootstrap Authors
* Copyright 2017-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
diff --git a/build/vnu-jar.js b/build/vnu-jar.js
index ebd027adcf..f4a4141c16 100644
--- a/build/vnu-jar.js
+++ b/build/vnu-jar.js
@@ -4,7 +4,7 @@
* Script to run vnu-jar if Java is available.
* Copyright 2017-2020 The Bootstrap Authors
* Copyright 2017-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
diff --git a/build/zip-examples.js b/build/zip-examples.js
index 3f7fb9abb9..5d6d31454c 100644
--- a/build/zip-examples.js
+++ b/build/zip-examples.js
@@ -4,7 +4,7 @@
* Script to create the built examples zip archive;
* requires the `zip` command to be present!
* Copyright 2020 The Bootstrap Authors
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
'use strict'
diff --git a/js/src/alert.js b/js/src/alert.js
index c15460ae33..4ec0395c4f 100644
--- a/js/src/alert.js
+++ b/js/src/alert.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): alert.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/button.js b/js/src/button.js
index 08654d558e..ee7e274fec 100644
--- a/js/src/button.js
+++ b/js/src/button.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): button.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 4efea1021e..55ddc3eedf 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): carousel.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/collapse.js b/js/src/collapse.js
index 270eb85e23..27793f1d36 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): collapse.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index cba645a7ae..82dba11ad2 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): dropdown.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/index.js b/js/src/index.js
index 1caed5020a..60fc16f44e 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -14,7 +14,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): index.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/modal.js b/js/src/modal.js
index f898d0c465..0a2d99a032 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): modal.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/popover.js b/js/src/popover.js
index 95e9edc748..64185726d2 100644
--- a/js/src/popover.js
+++ b/js/src/popover.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): popover.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index 2413d04a54..c579cf5965 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): scrollspy.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/tab.js b/js/src/tab.js
index 5cccb10032..c096008e4b 100644
--- a/js/src/tab.js
+++ b/js/src/tab.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): tab.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/toast.js b/js/src/toast.js
index f7e58d98dd..8da5069e96 100644
--- a/js/src/toast.js
+++ b/js/src/toast.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): toast.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/tools/sanitizer.js b/js/src/tools/sanitizer.js
index e57f856f0f..8234f8db42 100644
--- a/js/src/tools/sanitizer.js
+++ b/js/src/tools/sanitizer.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): tools/sanitizer.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 6753c4c152..9b74603e25 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): tooltip.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/src/util.js b/js/src/util.js
index e88feb5647..7c97221521 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -1,7 +1,7 @@
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.5.0): util.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
diff --git a/js/tests/README.md b/js/tests/README.md
index 3b079d92ce..ace2b153a7 100644
--- a/js/tests/README.md
+++ b/js/tests/README.md
@@ -25,7 +25,7 @@ To run the unit test suite via a real web browser, open `index.html` in the brow
* Each test should have a unique name clearly stating what unit is being tested.
* Each test should test only one unit per test, although one test can include several assertions. Create multiple tests for multiple units of functionality.
* Each test should begin with [`assert.expect`](https://api.qunitjs.com/assert/expect/) to ensure that the expected assertions are run.
-* Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#js)
+* Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md#js)
## Code coverage
diff --git a/js/tests/index.html b/js/tests/index.html
index 99acd4ad4e..c3afd75d54 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -46,7 +46,7 @@
'contextmenu'
].forEach(function(eventAlias) {
$.fn[eventAlias] = function() {
- throw new Error('Using the ".' + eventAlias + '()" method is not allowed, so that Bootstrap can be compatible with custom jQuery builds which exclude the "event aliases" module that defines said method. See https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#js')
+ throw new Error('Using the ".' + eventAlias + '()" method is not allowed, so that Bootstrap can be compatible with custom jQuery builds which exclude the "event aliases" module that defines said method. See https://github.com/twbs/bootstrap/blob/v4-dev/.github/CONTRIBUTING.md#js')
}
})
diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss
index 4109e4fbd7..aeb8d1cf5b 100644
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@ -2,7 +2,7 @@
* Bootstrap Grid v4.5.0 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
html {
diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss
index e61235ac64..2947a1360d 100644
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@ -2,7 +2,7 @@
* Bootstrap Reboot v4.5.0 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/
diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss
index 8ae96deb9d..ac588c4332 100644
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@ -2,7 +2,7 @@
* Bootstrap v4.5.0 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
@import "functions";
diff --git a/site/_includes/footer.html b/site/_includes/footer.html
index a46fbf80d9..cb15d77393 100644
--- a/site/_includes/footer.html
+++ b/site/_includes/footer.html
@@ -7,6 +7,6 @@
About
Designed and built with all the love in the world by the Bootstrap team with the help of our contributors.
- Currently v{{ site.current_version }}. Code licensed MIT, docs CC BY 3.0.
+ Currently v{{ site.current_version }}. Code licensed MIT, docs CC BY 3.0.