Skip to content

Commit 7f053bd

Browse files
mrholekmrholek
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.js.map # dist/js/bootstrap.bundle.min.js # dist/js/bootstrap.bundle.min.js.map # dist/js/bootstrap.esm.js # dist/js/bootstrap.esm.js.map # dist/js/bootstrap.esm.min.js # dist/js/bootstrap.esm.min.js.map # dist/js/bootstrap.js # dist/js/bootstrap.js.map # dist/js/bootstrap.min.js # dist/js/bootstrap.min.js.map # js/dist/alert.js # js/dist/alert.js.map # js/dist/base-component.js # js/dist/base-component.js.map # js/dist/button.js # js/dist/button.js.map # js/dist/carousel.js # js/dist/carousel.js.map # js/dist/collapse.js # js/dist/collapse.js.map # js/dist/dom/data.js # js/dist/dom/event-handler.js # js/dist/dom/event-handler.js.map # js/dist/dom/manipulator.js # js/dist/dom/selector-engine.js # js/dist/dropdown.js # js/dist/dropdown.js.map # js/dist/modal.js # js/dist/modal.js.map # js/dist/offcanvas.js # js/dist/offcanvas.js.map # js/dist/popover.js # js/dist/popover.js.map # js/dist/scrollspy.js # js/dist/scrollspy.js.map # js/dist/tab.js # js/dist/tab.js.map # js/dist/toast.js # js/dist/toast.js.map # js/dist/tooltip.js # js/dist/tooltip.js.map # package-lock.json # package.json # scss/_modal.scss # scss/_popover.scss # scss/_tooltip.scss # scss/bootstrap-grid.scss # scss/bootstrap-reboot.scss # scss/bootstrap-utilities.scss # scss/bootstrap.scss # scss/forms/_form-range.scss
2 parents 9d3af8e + 77d4143 commit 7f053bd

File tree

194 files changed

+8516
-5186
lines changed

Some content is hidden

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

194 files changed

+8516
-5186
lines changed

‎.bundlewatch.config.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
"files": [
33
{
44
"path": "./dist/css/bootstrap-grid.css",
5-
"maxSize": "7 kB"
5+
"maxSize": "7.25 kB"
66
},
77
{
88
"path": "./dist/css/bootstrap-grid.min.css",
9-
"maxSize": "6 kB"
9+
"maxSize": "6.5 kB"
1010
},
1111
{
1212
"path": "./dist/css/bootstrap-reboot.css",
13-
"maxSize": "2.25 kB"
13+
"maxSize": "2 kB"
1414
},
1515
{
1616
"path": "./dist/css/bootstrap-reboot.min.css",
1717
"maxSize": "2 kB"
1818
},
1919
{
2020
"path": "./dist/css/bootstrap-utilities.css",
21-
"maxSize": "7.5 kB"
21+
"maxSize": "7.25 kB"
2222
},
2323
{
2424
"path": "./dist/css/bootstrap-utilities.min.css",
25-
"maxSize": "6.75 kB"
25+
"maxSize": "6.6 kB"
2626
},
2727
{
2828
"path": "./dist/css/bootstrap.css",
29-
"maxSize": "24.25 kB"
29+
"maxSize": "25 kB"
3030
},
3131
{
3232
"path": "./dist/css/bootstrap.min.css",
33-
"maxSize": "22.25 kB"
33+
"maxSize": "22.75 kB"
3434
},
3535
{
3636
"path": "./dist/js/bootstrap.bundle.js",

‎.github/FUNDING.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/SUPPORT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.
77
For general troubleshooting or help getting started:
88

99
- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
10-
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
10+
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
1111
- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Our default branch is for development of our Bootstrap 5 release. Head to the [`
4646

4747
Several quick start options are available:
4848

49-
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.1.zip)
49+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.0.2.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.1`
53+
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.2`
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.
@@ -177,7 +177,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and
177177
- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
178178
- Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/).
179179
- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
180-
- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
180+
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
181181
- Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)).
182182
- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
183183

‎build/build-plugins.js

Lines changed: 54 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -59,76 +59,67 @@ const defaultPluginConfig = {
5959
}
6060

6161
const getConfigByPluginKey = pluginKey => {
62-
if (
63-
pluginKey === 'Data' ||
64-
pluginKey === 'Manipulator' ||
65-
pluginKey === 'EventHandler' ||
66-
pluginKey === 'SelectorEngine' ||
67-
pluginKey === 'Util' ||
68-
pluginKey === 'Sanitizer' ||
69-
pluginKey === 'Backdrop'
70-
) {
71-
return {
72-
external: []
62+
switch (pluginKey) {
63+
case 'Alert':
64+
case 'Offcanvas':
65+
case 'Tab':
66+
return defaultPluginConfig
67+
68+
case 'Base':
69+
case 'Button':
70+
case 'Carousel':
71+
case 'Collapse':
72+
case 'Modal':
73+
case 'ScrollSpy': {
74+
const config = Object.assign(defaultPluginConfig)
75+
config.external.push(bsPlugins.Manipulator)
76+
config.globals[bsPlugins.Manipulator] = 'Manipulator'
77+
return config
7378
}
74-
}
75-
76-
if (pluginKey === 'Alert' || pluginKey === 'Tab' || pluginKey === 'Offcanvas') {
77-
return defaultPluginConfig
78-
}
7979

80-
if (
81-
pluginKey === 'Base' ||
82-
pluginKey === 'Button' ||
83-
pluginKey === 'Carousel' ||
84-
pluginKey === 'Collapse' ||
85-
pluginKey === 'Modal' ||
86-
pluginKey === 'ScrollSpy'
87-
) {
88-
const config = Object.assign(defaultPluginConfig)
89-
config.external.push(bsPlugins.Manipulator)
90-
config.globals[bsPlugins.Manipulator] = 'Manipulator'
91-
return config
92-
}
80+
case 'Dropdown':
81+
case 'Tooltip': {
82+
const config = Object.assign(defaultPluginConfig)
83+
config.external.push(bsPlugins.Manipulator, '@popperjs/core')
84+
config.globals[bsPlugins.Manipulator] = 'Manipulator'
85+
config.globals['@popperjs/core'] = 'Popper'
86+
return config
87+
}
9388

94-
if (pluginKey === 'Dropdown' || pluginKey === 'Tooltip') {
95-
const config = Object.assign(defaultPluginConfig)
96-
config.external.push(bsPlugins.Manipulator, '@popperjs/core')
97-
config.globals[bsPlugins.Manipulator] = 'Manipulator'
98-
config.globals['@popperjs/core'] = 'Popper'
99-
return config
100-
}
89+
case 'Popover':
90+
return {
91+
external: [
92+
bsPlugins.Data,
93+
bsPlugins.SelectorEngine,
94+
bsPlugins.Tooltip
95+
],
96+
globals: {
97+
[bsPlugins.Data]: 'Data',
98+
[bsPlugins.SelectorEngine]: 'SelectorEngine',
99+
[bsPlugins.Tooltip]: 'Tooltip'
100+
}
101+
}
101102

102-
if (pluginKey === 'Popover') {
103-
return {
104-
external: [
105-
bsPlugins.Data,
106-
bsPlugins.SelectorEngine,
107-
bsPlugins.Tooltip
108-
],
109-
globals: {
110-
[bsPlugins.Data]: 'Data',
111-
[bsPlugins.SelectorEngine]: 'SelectorEngine',
112-
[bsPlugins.Tooltip]: 'Tooltip'
103+
case 'Toast':
104+
return {
105+
external: [
106+
bsPlugins.Data,
107+
bsPlugins.Base,
108+
bsPlugins.EventHandler,
109+
bsPlugins.Manipulator
110+
],
111+
globals: {
112+
[bsPlugins.Data]: 'Data',
113+
[bsPlugins.Base]: 'Base',
114+
[bsPlugins.EventHandler]: 'EventHandler',
115+
[bsPlugins.Manipulator]: 'Manipulator'
116+
}
113117
}
114-
}
115-
}
116118

117-
if (pluginKey === 'Toast') {
118-
return {
119-
external: [
120-
bsPlugins.Data,
121-
bsPlugins.Base,
122-
bsPlugins.EventHandler,
123-
bsPlugins.Manipulator
124-
],
125-
globals: {
126-
[bsPlugins.Data]: 'Data',
127-
[bsPlugins.Base]: 'Base',
128-
[bsPlugins.EventHandler]: 'EventHandler',
129-
[bsPlugins.Manipulator]: 'Manipulator'
119+
default:
120+
return {
121+
external: []
130122
}
131-
}
132123
}
133124
}
134125

‎build/vnu-jar.js

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
'use strict'
1111

12-
const childProcess = require('child_process')
12+
const { execFile, spawn } = require('child_process')
1313
const vnu = require('vnu-jar')
1414

15-
childProcess.exec('java -version', (error, stdout, stderr) => {
15+
execFile('java', ['-version'], (error, stdout, stderr) => {
1616
if (error) {
1717
console.error('Skipping vnu-jar test; Java is missing.')
1818
return
@@ -21,32 +21,19 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
2121
const is32bitJava = !/64-Bit/.test(stderr)
2222

2323
// vnu-jar accepts multiple ignores joined with a `|`.
24-
// Also note that the ignores are regular expressions.
24+
// Also note that the ignores are string regular expressions.
2525
const ignores = [
2626
// "autocomplete" is included in <button> and checkboxes and radio <input>s due to
2727
// Firefox's non-standard autocomplete behavior - see https://bugzilla.mozilla.org/show_bug.cgi?id=654072
2828
'Attribute “autocomplete” is only allowed when the input type is.*',
29-
'Attribute “autocomplete” not allowed on element “button” at this point.',
30-
// Markup used in Components → Forms → Layout → Form grid → Horizontal form is currently invalid,
31-
// but used this way due to lack of support for flexbox layout on <fieldset> element in most browsers
32-
'Element “legend” not allowed as child of element “div” in this context.*',
33-
// Content → Reboot uses various date/time inputs as a visual example.
34-
// Documentation does not rely on them being usable.
35-
'The “date” input type is not supported in all browsers.*',
36-
'The “week” input type is not supported in all browsers.*',
37-
'The “month” input type is not supported in all browsers.*',
38-
'The “color” input type is not supported in all browsers.*',
39-
'The “datetime-local” input type is not supported in all browsers.*',
40-
'The “time” input type is not supported in all browsers.*'
29+
'Attribute “autocomplete” not allowed on element “button” at this point.'
4130
].join('|')
4231

4332
const args = [
4433
'-jar',
4534
`"${vnu}"`,
4635
'--asciiquotes',
4736
'--skip-non-html',
48-
// Ignore the language code warnings
49-
'--no-langdetect',
5037
'--Werror',
5138
`--filterpattern "${ignores}"`,
5239
'_site/',
@@ -58,7 +45,7 @@ childProcess.exec('java -version', (error, stdout, stderr) => {
5845
args.splice(0, 0, '-Xss512k')
5946
}
6047

61-
return childProcess.spawn('java', args, {
48+
return spawn('java', args, {
6249
shell: true,
6350
stdio: 'inherit'
6451
})

‎config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildFuture: true
1818

1919
enableRobotsTXT: true
2020
metaDataFormat: "yaml"
21-
disableKinds: ["404", "taxonomy", "taxonomyTerm", "RSS"]
21+
disableKinds: ["404", "taxonomy", "term", "RSS"]
2222

2323
publishDir: "_site"
2424

@@ -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.1"
51-
current_ruby_version: "5.0.1"
50+
current_version: "5.0.2"
51+
current_ruby_version: "5.0.2"
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.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"
64+
source: "https://github.com/twbs/bootstrap/archive/v5.0.2.zip"
65+
dist: "https://github.com/twbs/bootstrap/releases/download/v5.0.2/bootstrap-5.0.2-dist.zip"
66+
dist_examples: "https://github.com/twbs/bootstrap/releases/download/v5.0.2/bootstrap-5.0.2-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].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"
70+
css: "https://cdn.jsdelivr.net/npm/[email protected].2/dist/css/bootstrap.min.css"
71+
css_hash: "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC"
72+
css_rtl: "https://cdn.jsdelivr.net/npm/[email protected].2/dist/css/bootstrap.rtl.min.css"
73+
css_rtl_hash: "sha384-gXt9imSW0VcJVHezoNQsP+TNrjYXoGcrqBZJpry9zJt8PCQjobwmhMGaDHTASo9N"
74+
js: "https://cdn.jsdelivr.net/npm/[email protected].2/dist/js/bootstrap.min.js"
75+
js_hash: "sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF"
76+
js_bundle: "https://cdn.jsdelivr.net/npm/[email protected].2/dist/js/bootstrap.bundle.min.js"
77+
js_bundle_hash: "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
7878
popper: "https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js"
7979
popper_hash: "sha384-IQsoLXl5PILFhosVNubq5LC7Qb9DXgDA9i+tQ8Zj3iwWAwPtgFTxbJ8NT4GN1R8p"

0 commit comments

Comments
 (0)