Skip to content

Commit 4ddde69

Browse files
mrholekmrholek
committed
Merge branch 'main' of https://github.com/twbs/bootstrap into main
# 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
2 parents 9bde6eb + bf09367 commit 4ddde69

File tree

173 files changed

+6963
-5259
lines changed

Some content is hidden

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

173 files changed

+6963
-5259
lines changed

‎.bundlewatch.config.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@
3434
},
3535
{
3636
"path": "./dist/js/bootstrap.bundle.js",
37-
"maxSize": "41 kB"
37+
"maxSize": "41.25 kB"
3838
},
3939
{
4040
"path": "./dist/js/bootstrap.bundle.min.js",
41-
"maxSize": "22 kB"
41+
"maxSize": "22.25 kB"
4242
},
4343
{
4444
"path": "./dist/js/bootstrap.esm.js",
4545
"maxSize": "27 kB"
4646
},
4747
{
4848
"path": "./dist/js/bootstrap.esm.min.js",
49-
"maxSize": "18 kB"
49+
"maxSize": "18.25 kB"
5050
},
5151
{
5252
"path": "./dist/js/bootstrap.js",
53-
"maxSize": "27 kB"
53+
"maxSize": "27.25 kB"
5454
},
5555
{
5656
"path": "./dist/js/bootstrap.min.js",

‎.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"plugin:import/errors",
55
"plugin:import/warnings",
66
"plugin:unicorn/recommended",
7-
"xo/esnext",
7+
"xo",
88
"xo/browser"
99
],
1010
"rules": {
@@ -51,6 +51,7 @@
5151
"unicorn/prefer-dom-node-append": "off",
5252
"unicorn/prefer-dom-node-dataset": "off",
5353
"unicorn/prefer-dom-node-remove": "off",
54+
"unicorn/prefer-module": "off",
5455
"unicorn/prefer-query-selector": "off",
5556
"unicorn/prefer-spread": "off",
5657
"unicorn/prevent-abbreviations": "off"

‎.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]
20+
node: [10, 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
@@ -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-beta3.zip)
49+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.0.zip)
5050
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
51-
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@next`
52-
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@next`
53-
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-beta3`
51+
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
52+
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap`
53+
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0`
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.

‎build/build-plugins.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ const getConfigByPluginKey = pluginKey => {
6565
pluginKey === 'EventHandler' ||
6666
pluginKey === 'SelectorEngine' ||
6767
pluginKey === 'Util' ||
68-
pluginKey === 'Sanitizer'
68+
pluginKey === 'Sanitizer' ||
69+
pluginKey === 'Backdrop'
6970
) {
7071
return {
7172
external: []
@@ -133,7 +134,8 @@ const getConfigByPluginKey = pluginKey => {
133134

134135
const utilObjects = new Set([
135136
'Util',
136-
'Sanitizer'
137+
'Sanitizer',
138+
'Backdrop'
137139
])
138140

139141
const domObjects = new Set([

‎config.yml

Lines changed: 15 additions & 15 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-beta3"
51-
current_ruby_version: "5.0.0.beta3"
50+
current_version: "5.0.0"
51+
current_ruby_version: "5.0.0"
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-beta3.zip"
65-
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta3/bootstrap-5.0.0-beta3-dist.zip"
66-
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.0-beta3/bootstrap-5.0.0-beta3-examples.zip"
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"
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]-beta3/dist/css/bootstrap.min.css"
71-
css_hash: "sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6"
72-
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected]-beta3/dist/css/bootstrap.rtl.min.css"
73-
css_rtl_hash: "sha384-trxYGD5BY4TyBTvU5H23FalSCYwpLA0vWEvXXGm5eytyztxb+97WzzY+IWDOSbav"
74-
js: "https://cdn.jsdelivr.net/npm/[email protected]-beta3/dist/js/bootstrap.min.js"
75-
js_hash: "sha384-j0CNLUeiqtyaRmlzUHCPZ+Gy5fQu0dQ6eZ/xAww941Ai1SxSY+0EQqNXNE6DZiVc"
76-
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected]-beta3/dist/js/bootstrap.bundle.min.js"
77-
js_bundle_hash: "sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf"
78-
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected].1/dist/umd/popper.min.js"
79-
popper_hash: "sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG"
70+
css: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
71+
css_hash: "sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
72+
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.rtl.min.css"
73+
css_rtl_hash: "sha384-jHiSqEim4+W1UCvv8kTcMbtCZlRF8MxbgKdfpvncia8gdN1UImBnhTpKtufREzv7"
74+
js: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
75+
js_hash: "sha384-lpyLfhYuitXl2zRZ5Bn2fqnhNAKOAaM/0Kr9laMspuaMiZfGmfwRNFh8HlMy49eQ"
76+
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
77+
js_bundle_hash: "sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8"
78+
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected].2/dist/umd/popper.min.js"
79+
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.min.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-grid.rtl.min.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)