diff options
39 files changed, 54 insertions, 54 deletions
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index e68c55ff27..7cab49f398 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -59,7 +59,7 @@ ], "ci": { "trackBranches": [ - "master", + "main", "v4-dev" ] } diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7acd7ea8c2..9b9b2edadc 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 `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 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index becd082a55..ca8173297c 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/) 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/main/.github/CONTRIBUTING.md) Bug reports must include: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index ed71d397de..21935874dc 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/main/.github/CONTRIBUTING.md) Feature requests must include: diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 1c9932b5e3..1c4f4be9b8 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -3,7 +3,7 @@ name: Release notes on: push: branches: - - master + - main jobs: update_release_draft: @@ -54,7 +54,7 @@ Read the [Getting started page](https://getbootstrap.com/docs/4.5/getting-starte ## Status [](https://bootstrap-slack.herokuapp.com/) -[](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amaster) +[](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amain) [](https://www.npmjs.com/package/bootstrap) [](https://rubygems.org/gems/bootstrap) [](https://atmospherejs.com/twbs/bootstrap) @@ -62,9 +62,9 @@ Read the [Getting started page](https://getbootstrap.com/docs/4.5/getting-starte [](https://www.nuget.org/packages/bootstrap/absoluteLatest) [](https://david-dm.org/twbs/bootstrap?type=peer) [](https://david-dm.org/twbs/bootstrap?type=dev) -[](https://coveralls.io/github/twbs/bootstrap?branch=master) -[](https://github.com/twbs/bootstrap/tree/master/dist/css/bootstrap.min.css) -[](https://github.com/twbs/bootstrap/tree/master/dist/js/bootstrap.min.js) +[](https://coveralls.io/github/twbs/bootstrap?branch=main) +[](https://github.com/twbs/bootstrap/tree/main/dist/css/bootstrap.min.css) +[](https://github.com/twbs/bootstrap/tree/main/dist/js/bootstrap.min.js) [](https://www.browserstack.com/automate/public-build/SkxZcStBeExEdVJqQ2hWYnlWckpkNmNEY213SFp6WHFETWk2bGFuY3pCbz0tLXhqbHJsVlZhQnRBdEpod3NLSDMzaHc9PQ==--3d0b75245708616eb93113221beece33e680b229) [](#backers) [](#sponsors) @@ -114,7 +114,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/.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). +Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/main/.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 @@ -141,11 +141,11 @@ You can find all our previous releases docs on <https://getbootstrap.com/docs/ve ## Contributing -Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. +Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. -Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo). +Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/main/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo). -Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>. +Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/main/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>. ## Community @@ -214,4 +214,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 c57c53ce4e..c5c357645b 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 e68d4fe62a..ba6e46a471 100644 --- 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 36bb4657d6..cfbf377716 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/ship.sh b/build/ship.sh index ce4f7cded1..da5a03bcd1 100644 --- a/build/ship.sh +++ b/build/ship.sh @@ -29,7 +29,7 @@ fi printf "\n%s=======================================================%s" "$magenta" "$end" printf "\n%sPulling latest changes...%s" "$magenta" "$end" printf "\n%s=======================================================\n\n%s" "$magenta" "$end" -git pull origin master +git pull origin main # Update version number printf "\n%s=======================================================%s" "$magenta" "$end" diff --git a/build/vnu-jar.js b/build/vnu-jar.js index 674cdb4430..90c1a12ab9 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 c089036d6e..222706cb43 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/index.esm.js b/js/index.esm.js index d7ddb67f5a..068117b9ec 100644 --- a/js/index.esm.js +++ b/js/index.esm.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): index.esm.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/index.umd.js b/js/index.umd.js index ba8991d60c..ca3510ea27 100644 --- a/js/index.umd.js +++ b/js/index.umd.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): index.umd.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/alert.js b/js/src/alert.js index c271fdf191..95eec5331f 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 fd29e5218b..23c1a0db68 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 2d0a5930b8..58382f6e25 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 ec75a81960..639369b017 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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/dom/data.js b/js/src/dom/data.js index 867bac7b6f..06f4102b00 100644 --- a/js/src/dom/data.js +++ b/js/src/dom/data.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): dom/data.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/dom/event-handler.js b/js/src/dom/event-handler.js index c5cb9cad08..82262fa5a8 100644 --- a/js/src/dom/event-handler.js +++ b/js/src/dom/event-handler.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): dom/event-handler.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/dom/manipulator.js b/js/src/dom/manipulator.js index 87be3b15e7..471913e0e6 100644 --- a/js/src/dom/manipulator.js +++ b/js/src/dom/manipulator.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): dom/manipulator.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/dom/polyfill.js b/js/src/dom/polyfill.js index ce397c2c34..c239842ee6 100644 --- a/js/src/dom/polyfill.js +++ b/js/src/dom/polyfill.js @@ -3,7 +3,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): dom/polyfill.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/dom/selector-engine.js b/js/src/dom/selector-engine.js index 876d8393f5..4a508b97a6 100644 --- a/js/src/dom/selector-engine.js +++ b/js/src/dom/selector-engine.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): dom/selector-engine.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 78e1a2eef3..9653e32fa0 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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/modal.js b/js/src/modal.js index f5b5721f47..0d15041bd7 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 61ce5b267e..e17704d45d 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 8e414e91bc..90e03b0007 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 c7bb9c22df..1c1f5d28d0 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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 a55131531b..4d63e14b52 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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/tooltip.js b/js/src/tooltip.js index 68992fe771..e0a5952991 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): 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/index.js b/js/src/util/index.js index f92c7eb5d7..59efa6655d 100644 --- a/js/src/util/index.js +++ b/js/src/util/index.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): util/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/util/sanitizer.js b/js/src/util/sanitizer.js index 35f6db9ec8..e1ec36a400 100644 --- a/js/src/util/sanitizer.js +++ b/js/src/util/sanitizer.js @@ -1,7 +1,7 @@ /** * -------------------------------------------------------------------------- * Bootstrap (v5.0.0-alpha1): util/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/tests/README.md b/js/tests/README.md index e3ddde78c7..f614499b49 100644 --- a/js/tests/README.md +++ b/js/tests/README.md @@ -22,7 +22,7 @@ To run the unit test suite via [Karma](https://karma-runner.github.io/) and debu - Each test should be in the corresponding `describe`. - 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 use [`expect`](https://jasmine.github.io/api/edge/matchers.html) to ensure something is expected. -- Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/master/.github/CONTRIBUTING.md#js) +- Each test should follow the project's [JavaScript Code Guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md#js) ## Code coverage diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index 5ad4b824b7..900fc31be9 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -2,7 +2,7 @@ * Bootstrap Grid v5.0.0-alpha1 (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) */ $include-column-box-sizing: true !default; diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 3779e36dc5..a190314c32 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -2,7 +2,7 @@ * Bootstrap Reboot v5.0.0-alpha1 (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-utilities.scss b/scss/bootstrap-utilities.scss index bb1b67cd53..e4790cf444 100644 --- a/scss/bootstrap-utilities.scss +++ b/scss/bootstrap-utilities.scss @@ -2,7 +2,7 @@ * Bootstrap Utilities v5.0.0-alpha1 (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) */ // Configuration diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 38336518b3..f72fcb8e57 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -2,7 +2,7 @@ * Bootstrap v5.0.0-alpha1 (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) */ // scss-docs-start import-stack diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index 2076c426e4..5167c104a8 100644 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -7,6 +7,6 @@ <li class="d-inline-block ml-3"><a href="/docs/{{ .Site.Params.docs_version }}/about/overview/">About</a></li> </ul> <p class="mb-0">Designed and built with all the love in the world by the <a href="/docs/{{ .Site.Params.docs_version }}/about/team/">Bootstrap team</a> with the help of <a href="{{ .Site.Params.repo }}/graphs/contributors">our contributors</a>.</p> - <p class="mb-0">Currently v{{ .Site.Params.current_version }}. Code licensed <a href="{{ .Site.Params.repo }}/blob/master/LICENSE" target="_blank" rel="license noopener">MIT</a>, docs <a href="https://creativecommons.org/licenses/by/3.0/" target="_blank" rel="license noopener">CC BY 3.0</a>.</p> + <p class="mb-0">Currently v{{ .Site.Params.current_version }}. Code licensed <a href="{{ .Site.Params.repo }}/blob/main/LICENSE" target="_blank" rel="license noopener">MIT</a>, docs <a href="https://creativecommons.org/licenses/by/3.0/" target="_blank" rel="license noopener">CC BY 3.0</a>.</p> </div> </footer> |