Skip to content

Commit 21431c2

Browse files
committed
Merge tag 'v5.1.3' 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/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/scrollspy.js.map # js/dist/tab.js # js/dist/toast.js # js/dist/tooltip.js # package-lock.json # package.json # scss/_modal.scss # scss/_reboot.scss # scss/bootstrap-grid.scss # scss/bootstrap-reboot.scss # scss/bootstrap-utilities.scss # scss/bootstrap.scss # scss/mixins/_utilities.scss
2 parents 1b12ca2 + 1a6fdfa commit 21431c2

File tree

482 files changed

+20108
-18462
lines changed

Some content is hidden

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

482 files changed

+20108
-18462
lines changed

.bundlewatch.config.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,51 @@
1010
},
1111
{
1212
"path": "./dist/css/bootstrap-reboot.css",
13-
"maxSize": "2 kB"
13+
"maxSize": "2.5 kB"
1414
},
1515
{
1616
"path": "./dist/css/bootstrap-reboot.min.css",
17-
"maxSize": "2 kB"
17+
"maxSize": "2.35 kB"
1818
},
1919
{
2020
"path": "./dist/css/bootstrap-utilities.css",
21-
"maxSize": "7.25 kB"
21+
"maxSize": "7.75 kB"
2222
},
2323
{
2424
"path": "./dist/css/bootstrap-utilities.min.css",
25-
"maxSize": "6.6 kB"
25+
"maxSize": "6.85 kB"
2626
},
2727
{
2828
"path": "./dist/css/bootstrap.css",
29-
"maxSize": "25 kB"
29+
"maxSize": "25.5 kB"
3030
},
3131
{
3232
"path": "./dist/css/bootstrap.min.css",
33-
"maxSize": "22.75 kB"
33+
"maxSize": "23.25 kB"
3434
},
3535
{
3636
"path": "./dist/js/bootstrap.bundle.js",
37-
"maxSize": "41.5 kB"
37+
"maxSize": "42.5 kB"
3838
},
3939
{
4040
"path": "./dist/js/bootstrap.bundle.min.js",
41-
"maxSize": "22.25 kB"
41+
"maxSize": "22.75 kB"
4242
},
4343
{
4444
"path": "./dist/js/bootstrap.esm.js",
45-
"maxSize": "27 kB"
45+
"maxSize": "27.5 kB"
4646
},
4747
{
4848
"path": "./dist/js/bootstrap.esm.min.js",
4949
"maxSize": "18.25 kB"
5050
},
5151
{
5252
"path": "./dist/js/bootstrap.js",
53-
"maxSize": "27.5 kB"
53+
"maxSize": "28.25 kB"
5454
},
5555
{
5656
"path": "./dist/js/bootstrap.min.js",
57-
"maxSize": "15.75 kB"
57+
"maxSize": "16 kB"
5858
}
5959
],
6060
"ci": {

.cspell.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"version": "0.2",
3+
"words": [
4+
"affordance",
5+
"allowfullscreen",
6+
"autohide",
7+
"autohiding",
8+
"autoplay",
9+
"autoplays",
10+
"blazingly",
11+
"Blockquotes",
12+
"Bootstrappers",
13+
"borderless",
14+
"browserslist",
15+
"browserslistrc",
16+
"btncheck",
17+
"btnradio",
18+
"callout",
19+
"callouts",
20+
"clearfix",
21+
"Codesniffer",
22+
"colorspace",
23+
"combinator",
24+
"Contentful",
25+
"Cpath",
26+
"Crossfade",
27+
"cssgrid",
28+
"Csvg",
29+
"Datalists",
30+
"Deque",
31+
"discoverability",
32+
"docsearch",
33+
"docsref",
34+
"dropend",
35+
"dropleft",
36+
"dropright",
37+
"dropstart",
38+
"dropup",
39+
"errorf",
40+
"favicon",
41+
"favicons",
42+
"fieldsets",
43+
"flexbox",
44+
"fullscreen",
45+
"fusv",
46+
"getbootstrap",
47+
"globby",
48+
"Grayscale",
49+
"Hoverable",
50+
"hreflang",
51+
"hstack",
52+
"jsdelivr",
53+
"Jumpstart",
54+
"keyframes",
55+
"libera",
56+
"Libsass",
57+
"lightboxes",
58+
"Lowercased",
59+
"markdownify",
60+
"mediaqueries",
61+
"minifiers",
62+
"monospace",
63+
"mouseleave",
64+
"navbars",
65+
"navs",
66+
"Neue",
67+
"noindex",
68+
"Noto",
69+
"offcanvas",
70+
"offcanvases",
71+
"popperjs",
72+
"prebuild",
73+
"precompiled",
74+
"prefersreducedmotion",
75+
"prepended",
76+
"printf",
77+
"rects",
78+
"relref",
79+
"rgba",
80+
"roboto",
81+
"RTLCSS",
82+
"ruleset",
83+
"screenreaders",
84+
"scrollbars",
85+
"scrollspy",
86+
"Segoe",
87+
"sirv",
88+
"srcset",
89+
"stickied",
90+
"Stylelint",
91+
"subnav",
92+
"svgo",
93+
"tabbable",
94+
"textareas",
95+
"toggleable",
96+
"topbar",
97+
"touchend",
98+
"twbs",
99+
"unitless",
100+
"Unported",
101+
"unstylable",
102+
"unstyled",
103+
"Uppercased",
104+
"urlize",
105+
"vbtn",
106+
"viewports",
107+
"vstack",
108+
"walkthroughs",
109+
"WCAG",
110+
"webfont",
111+
"Woohoo",
112+
"zindex",
113+
"بالعالم",
114+
"مرحبا"
115+
],
116+
"language": "en,en-US",
117+
"ignorePaths": [
118+
".cspell.json",
119+
".min."
120+
]
121+
}

.eslintrc.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
"xo/browser"
99
],
1010
"rules": {
11+
"arrow-body-style": "off",
1112
"capitalized-comments": "off",
13+
"comma-dangle": [
14+
"error",
15+
"never"
16+
],
1217
"indent": [
1318
"error",
1419
2,
@@ -36,22 +41,26 @@
3641
"error",
3742
"always"
3843
],
44+
"operator-linebreak": [
45+
"error",
46+
"after"
47+
],
3948
"semi": [
4049
"error",
4150
"never"
4251
],
43-
"unicorn/consistent-function-scoping": "off",
4452
"unicorn/explicit-length-check": "off",
4553
"unicorn/no-array-callback-reference": "off",
4654
"unicorn/no-array-for-each": "off",
55+
"unicorn/no-array-method-this-argument": "off",
4756
"unicorn/no-for-loop": "off",
4857
"unicorn/no-null": "off",
4958
"unicorn/no-unused-properties": "error",
50-
"unicorn/no-useless-undefined": "off",
51-
"unicorn/prefer-dom-node-append": "off",
59+
"unicorn/numeric-separators-style": "off",
60+
"unicorn/prefer-array-flat": "off",
5261
"unicorn/prefer-dom-node-dataset": "off",
53-
"unicorn/prefer-dom-node-remove": "off",
5462
"unicorn/prefer-module": "off",
63+
"unicorn/prefer-prototype-methods": "off",
5564
"unicorn/prefer-query-selector": "off",
5665
"unicorn/prefer-spread": "off",
5766
"unicorn/prevent-abbreviations": "off"

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ restrictions:
2020

2121
* Please **do not** use the issue tracker for personal support requests. Stack
2222
Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag),
23-
[Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](README.md#community) are better places to get help.
23+
[Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](/README.md#community) are better places to get help.
2424

2525
* Please **do not** derail or troll issues. Keep the discussion on topic and
2626
respect the opinions of others.

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Report a bug
2+
description: Tell us about a bug or issue you may have identified in Bootstrap.
3+
title: "Provide a general summary of the issue"
4+
labels: [bug]
5+
assignees: "-"
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Prerequisites
10+
description: Take a couple minutes to help our maintainers work faster.
11+
options:
12+
- label: I have [searched](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) for duplicate or closed issues
13+
required: true
14+
- label: I have [validated](https://html5.validator.nu/) any HTML to avoid common problems
15+
required: true
16+
- label: I have read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md)
17+
required: true
18+
- type: textarea
19+
id: what-happened
20+
attributes:
21+
label: Describe the issue
22+
description: Provide a summary of the issue and what you expected to happen, including specific steps to reproduce.
23+
validations:
24+
required: true
25+
- type: textarea
26+
id: reduced-test-case
27+
attributes:
28+
label: Reduced test cases
29+
description: Include links [reduced test case](https://css-tricks.com/reduced-test-cases/) links or suggested fixes using CodePen ([v4 template](https://codepen.io/team/bootstrap/pen/yLabNQL) or [v5 template](https://codepen.io/team/bootstrap/pen/qBamdLj)).
30+
validations:
31+
required: true
32+
- type: dropdown
33+
id: os
34+
attributes:
35+
label: What operating system(s) are you seeing the problem on?
36+
multiple: true
37+
options:
38+
- Windows
39+
- macOS
40+
- Android
41+
- iOS
42+
- Linux
43+
validations:
44+
required: true
45+
- type: dropdown
46+
id: browser
47+
attributes:
48+
label: What browser(s) are you seeing the problem on?
49+
multiple: true
50+
options:
51+
- Chrome
52+
- Safari
53+
- Firefox
54+
- Microsoft Edge
55+
- Opera
56+
- type: input
57+
id: version
58+
attributes:
59+
label: What version of Bootstrap are you using?
60+
placeholder: "e.g., v5.1.0 or v4.5.2"
61+
validations:
62+
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
contact_links:
2-
- name: Ask a question
2+
- name: Ask the community
33
url: https://github.com/twbs/bootstrap/discussions/new
4-
about: Ask and discuss questions with other Bootstrap community members
4+
about: Ask and discuss questions with other Bootstrap community members.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Feature request
2+
description: Suggest new or updated features to include in Bootstrap.
3+
title: "Suggest a new feature"
4+
labels: [feature]
5+
assignees: []
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Prerequisites
10+
description: Take a couple minutes to help our maintainers work faster.
11+
options:
12+
- label: I have [searched](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue) for duplicate or closed feature requests
13+
required: true
14+
- label: I have read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md)
15+
required: true
16+
- type: textarea
17+
id: proposal
18+
attributes:
19+
label: Proposal
20+
description: Provide detailed information for what we should add, including relevant links to prior art, screenshots, or live demos whenever possible.
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: motivation
25+
attributes:
26+
label: Motivation and context
27+
description: Tell us why this change is needed or helpful, and what problems it may help solve.
28+
validations:
29+
required: true

.github/workflows/browserstack.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,7 @@ jobs:
2121
uses: actions/setup-node@v2
2222
with:
2323
node-version: "${{ env.NODE }}"
24-
25-
- name: Set up npm cache
26-
uses: actions/cache@v2
27-
with:
28-
path: ~/.npm
29-
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
30-
restore-keys: |
31-
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
24+
cache: npm
3225

3326
- name: Install npm dependencies
3427
run: npm ci
@@ -41,3 +34,4 @@ jobs:
4134
env:
4235
BROWSER_STACK_ACCESS_KEY: "${{ secrets.BROWSER_STACK_ACCESS_KEY }}"
4336
BROWSER_STACK_USERNAME: "${{ secrets.BROWSER_STACK_USERNAME }}"
37+
GITHUB_SHA: "${{ github.sha }}"

0 commit comments

Comments
 (0)