Skip to content

Commit 9d3af8e

Browse files
committed
Merge branch 'main' of https://github.com/twbs/bootstrap
# Conflicts: # dist/css/bootstrap-grid.css # dist/css/bootstrap-grid.css.map # dist/css/bootstrap-grid.min.css # dist/css/bootstrap-grid.min.css.map # dist/css/bootstrap-grid.rtl.css # dist/css/bootstrap-grid.rtl.css.map # dist/css/bootstrap-grid.rtl.min.css # dist/css/bootstrap-grid.rtl.min.css.map # dist/css/bootstrap-reboot.css # dist/css/bootstrap-reboot.css.map # dist/css/bootstrap-reboot.min.css # dist/css/bootstrap-reboot.min.css.map # dist/css/bootstrap-reboot.rtl.css # dist/css/bootstrap-reboot.rtl.css.map # dist/css/bootstrap-reboot.rtl.min.css # dist/css/bootstrap-reboot.rtl.min.css.map # dist/css/bootstrap-utilities.css # dist/css/bootstrap-utilities.css.map # dist/css/bootstrap-utilities.min.css # dist/css/bootstrap-utilities.min.css.map # dist/css/bootstrap-utilities.rtl.css # dist/css/bootstrap-utilities.rtl.css.map # dist/css/bootstrap-utilities.rtl.min.css # dist/css/bootstrap-utilities.rtl.min.css.map # dist/css/bootstrap.css # dist/css/bootstrap.css.map # dist/css/bootstrap.min.css # dist/css/bootstrap.min.css.map # dist/css/bootstrap.rtl.css # dist/css/bootstrap.rtl.css.map # dist/css/bootstrap.rtl.min.css # dist/css/bootstrap.rtl.min.css.map # dist/js/bootstrap.bundle.js # dist/js/bootstrap.bundle.min.js # dist/js/bootstrap.esm.js # dist/js/bootstrap.esm.min.js # dist/js/bootstrap.js # dist/js/bootstrap.min.js # js/dist/alert.js # js/dist/base-component.js # js/dist/button.js # js/dist/carousel.js # js/dist/collapse.js # js/dist/dom/data.js # js/dist/dom/event-handler.js # js/dist/dom/manipulator.js # js/dist/dom/selector-engine.js # js/dist/dropdown.js # js/dist/modal.js # js/dist/offcanvas.js # js/dist/popover.js # js/dist/scrollspy.js # js/dist/tab.js # js/dist/toast.js # js/dist/tooltip.js # package-lock.json # package.json # scss/_list-group.scss # scss/bootstrap-grid.scss # scss/bootstrap-reboot.scss # scss/bootstrap-utilities.scss # scss/bootstrap.scss # scss/forms/_form-control.scss # scss/mixins/_buttons.scss
2 parents 4ddde69 + 1366659 commit 9d3af8e

File tree

139 files changed

+3983
-3663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+3983
-3663
lines changed

.bundlewatch.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
{
3636
"path": "./dist/js/bootstrap.bundle.js",
37-
"maxSize": "41.25 kB"
37+
"maxSize": "41.5 kB"
3838
},
3939
{
4040
"path": "./dist/js/bootstrap.bundle.min.js",
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"path": "./dist/js/bootstrap.js",
53-
"maxSize": "27.25 kB"
53+
"maxSize": "27.5 kB"
5454
},
5555
{
5656
"path": "./dist/js/bootstrap.min.js",

.github/release-drafter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ categories:
1717
- 'fix'
1818
- 'bugfix'
1919
- 'bug'
20-
- title: '⚡ Performance Improvements'
20+
- title: '⚡ Performance improvements'
2121
labels:
2222
- 'performance'
2323
- title: '🎨 CSS'
@@ -29,6 +29,9 @@ categories:
2929
- title: '📖 Docs'
3030
labels:
3131
- 'docs'
32+
- title: '🛠 Examples'
33+
labels:
34+
- 'examples'
3235
- title: '🌎 Accessibility'
3336
labels:
3437
- 'accessibility'

.github/workflows/js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
node: [10, 12, 14, 16]
20+
node: [12, 14, 16]
2121

2222
steps:
2323
- name: Clone repository

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</p>
2323

2424

25-
## Bootstrap 4
25+
## Bootstrap 5
2626

27-
Our default branch is for development of our upcoming Bootstrap 5 release. Head to the [`v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev) to view the readme, documentation, and source code for Bootstrap 4.
27+
Our default branch is for development of our Bootstrap 5 release. Head to the [`v4-dev` branch](https://github.com/twbs/bootstrap/tree/v4-dev) to view the readme, documentation, and source code for Bootstrap 4.
2828

2929

3030
## Table of contents
@@ -46,11 +46,11 @@ Our default branch is for development of our upcoming Bootstrap 5 release. Head
4646

4747
Several quick start options are available:
4848

49-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0.zip)
49+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.1.zip)
5050
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
5151
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
5252
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap`
53-
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0`
53+
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.1`
5454
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`
5555

5656
Read the [Getting started page](https://getbootstrap.com/docs/5.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.

config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ params:
4747
social_image_path: /docs/5.0/assets/brand/bootstrap-social.png
4848
social_logo_path: /docs/5.0/assets/brand/bootstrap-social-logo.png
4949

50-
current_version: "5.0.0"
51-
current_ruby_version: "5.0.0"
50+
current_version: "5.0.1"
51+
current_ruby_version: "5.0.1"
5252
docs_version: "5.0"
5353
rfs_version: "9.0.3"
5454
github_org: "https://github.com/twbs"
@@ -61,19 +61,19 @@ params:
6161
icons: "https://icons.getbootstrap.com/"
6262

6363
download:
64-
source: "https://github.com/twbs/bootstrap/archive/v5.0.0.zip"
65-
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0/bootstrap-5.0.0-dist.zip"
66-
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0/bootstrap-5.0.0-examples.zip"
64+
source: "https://github.com/twbs/bootstrap/archive/v5.0.1.zip"
65+
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.1/bootstrap-5.0.1-dist.zip"
66+
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.1/bootstrap-5.0.1-examples.zip"
6767

6868
cdn:
6969
# See https://www.srihash.org for info on how to generate the hashes
70-
css: "https://cdn.jsdelivr.net/npm/[email protected].0/dist/css/bootstrap.min.css"
71-
css_hash: "sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
72-
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected].0/dist/css/bootstrap.rtl.min.css"
73-
css_rtl_hash: "sha384-jHiSqEim4+W1UCvv8kTcMbtCZlRF8MxbgKdfpvncia8gdN1UImBnhTpKtufREzv7"
74-
js: "https://cdn.jsdelivr.net/npm/[email protected].0/dist/js/bootstrap.min.js"
75-
js_hash: "sha384-lpyLfhYuitXl2zRZ5Bn2fqnhNAKOAaM/0Kr9laMspuaMiZfGmfwRNFh8HlMy49eQ"
76-
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected].0/dist/js/bootstrap.bundle.min.js"
77-
js_bundle_hash: "sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8"
70+
css: "https://cdn.jsdelivr.net/npm/[email protected].1/dist/css/bootstrap.min.css"
71+
css_hash: "sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x"
72+
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected].1/dist/css/bootstrap.rtl.min.css"
73+
css_rtl_hash: "sha384-LPvXVVAlyPoBSGkX8UddpctDks+1P4HG8MhT7/YwqHtJ40bstjzCqjj+VVVDhsCo"
74+
js: "https://cdn.jsdelivr.net/npm/[email protected].1/dist/js/bootstrap.min.js"
75+
js_hash: "sha384-Atwg2Pkwv9vp0ygtn1JAojH0nYbwNJLPhwyoVbhoPwBhjQPR5VtM2+xf0Uwh9KtT"
76+
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected].1/dist/js/bootstrap.bundle.min.js"
77+
js_bundle_hash: "sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4"
7878
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
7979
popper_hash: "sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p"

dist/css/bootstrap-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-utilities.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)