Skip to content

Commit 470d621

Browse files
mrholekmrholek
committed
Merge branch 'main' of https://github.com/twbs/bootstrap into main
# Conflicts: # dist/css/bootstrap-grid.css.map # dist/css/bootstrap-grid.rtl.css.map # dist/css/bootstrap-reboot.css.map # dist/css/bootstrap-reboot.rtl.css.map # dist/css/bootstrap-utilities.css # dist/css/bootstrap-utilities.css.map # dist/css/bootstrap-utilities.rtl.css # dist/css/bootstrap-utilities.rtl.css.map # dist/css/bootstrap.css # dist/css/bootstrap.css.map # dist/css/bootstrap.rtl.css # dist/css/bootstrap.rtl.css.map # dist/js/bootstrap.bundle.js # dist/js/bootstrap.bundle.js.map # dist/js/bootstrap.esm.js # dist/js/bootstrap.esm.js.map # dist/js/bootstrap.js # dist/js/bootstrap.js.map # js/dist/alert.js # js/dist/alert.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/dom/selector-engine.js.map # js/dist/dropdown.js # js/dist/dropdown.js.map # js/dist/modal.js # js/dist/modal.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.json # scss/_accordion.scss # scss/_alert.scss # scss/_buttons.scss # scss/_carousel.scss # scss/_list-group.scss # scss/_nav.scss # scss/_variables.scss # scss/bootstrap.scss # scss/mixins/_alert.scss # scss/mixins/_buttons.scss # scss/mixins/_list-group.scss
2 parents 5a19b44 + 548be2e commit 470d621

File tree

318 files changed

+26722
-7986
lines changed

Some content is hidden

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

318 files changed

+26722
-7986
lines changed

‎.bundlewatch.config.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,43 @@
1818
},
1919
{
2020
"path": "./dist/css/bootstrap-utilities.css",
21-
"maxSize": "7 kB"
21+
"maxSize": "7.5 kB"
2222
},
2323
{
2424
"path": "./dist/css/bootstrap-utilities.min.css",
25-
"maxSize": "6.25 kB"
25+
"maxSize": "6.75 kB"
2626
},
2727
{
2828
"path": "./dist/css/bootstrap.css",
29-
"maxSize": "24 kB"
29+
"maxSize": "24.25 kB"
3030
},
3131
{
3232
"path": "./dist/css/bootstrap.min.css",
33-
"maxSize": "22 kB"
33+
"maxSize": "22.25 kB"
3434
},
3535
{
3636
"path": "./dist/js/bootstrap.bundle.js",
37-
"maxSize": "41 kB"
37+
"maxSize": "43 kB"
3838
},
3939
{
4040
"path": "./dist/js/bootstrap.bundle.min.js",
41-
"maxSize": "21.5 kB"
41+
"maxSize": "22.5 kB"
4242
},
4343
{
4444
"path": "./dist/js/bootstrap.esm.js",
45-
"maxSize": "27 kB"
45+
"maxSize": "28.5 kB"
4646
},
4747
{
4848
"path": "./dist/js/bootstrap.esm.min.js",
49-
"maxSize": "18 kB"
49+
"maxSize": "19 kB"
5050
},
5151
{
5252
"path": "./dist/js/bootstrap.js",
53-
"maxSize": "28 kB"
53+
"maxSize": "29 kB"
5454
},
5555
{
5656
"path": "./dist/js/bootstrap.min.js",
57-
"maxSize": "15.5 kB"
57+
"maxSize": "16.25 kB"
5858
}
5959
],
6060
"ci": {

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**/*.min.js
22
**/dist/
33
**/vendor/
4-
/_gh_pages/
4+
/_site/
55
/js/coverage/
66
/site/static/sw.js

‎.eslintrc.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,23 @@
3636
"error",
3737
"always"
3838
],
39-
"prefer-named-capture-group": "off",
4039
"semi": [
4140
"error",
4241
"never"
4342
],
4443
"unicorn/consistent-function-scoping": "off",
4544
"unicorn/explicit-length-check": "off",
46-
"unicorn/import-index": "off",
47-
"unicorn/no-fn-reference-in-iterator": "off",
45+
"unicorn/no-array-callback-reference": "off",
46+
"unicorn/no-array-for-each": "off",
4847
"unicorn/no-for-loop": "off",
4948
"unicorn/no-null": "off",
5049
"unicorn/no-unused-properties": "error",
5150
"unicorn/no-useless-undefined": "off",
52-
"unicorn/prefer-dataset": "off",
53-
"unicorn/prefer-node-append": "off",
54-
"unicorn/prefer-node-remove": "off",
55-
"unicorn/prefer-optional-catch-binding": "off",
51+
"unicorn/prefer-dom-node-append": "off",
52+
"unicorn/prefer-dom-node-dataset": "off",
53+
"unicorn/prefer-dom-node-remove": "off",
5654
"unicorn/prefer-query-selector": "off",
55+
"unicorn/prefer-spread": "off",
5756
"unicorn/prevent-abbreviations": "off"
5857
}
5958
}

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ updates:
1515
- v5
1616
versioning-strategy: increase
1717
rebase-strategy: disabled
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
schedule:
21+
interval: weekly
22+
day: tuesday
23+
time: "12:00"
24+
timezone: Europe/Athens

‎.github/release-drafter.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ prerelease: true
44
exclude-labels:
55
- 'skip-changelog'
66
categories:
7+
- title: '❗ Breaking Changes'
8+
labels:
9+
- 'breaking-change'
710
- title: '🚀 Features'
811
labels:
912
- 'new-feature'
@@ -14,6 +17,9 @@ categories:
1417
- 'fix'
1518
- 'bugfix'
1619
- 'bug'
20+
- title: '⚡ Performance Improvements'
21+
labels:
22+
- 'performance'
1723
- title: '🎨 CSS'
1824
labels:
1925
- 'css'
@@ -26,11 +32,19 @@ categories:
2632
- title: '🌎 Accessibility'
2733
labels:
2834
- 'accessibility'
35+
- title: '🔧 Utility API'
36+
labels:
37+
- 'utility API'
38+
- 'utilities'
39+
- title: '🏭 Tests'
40+
labels:
41+
- 'tests'
2942
- title: '🧰 Misc'
3043
labels:
3144
- 'build'
3245
- 'meta'
3346
- 'chore'
47+
- 'CI'
3448
- title: '📦 Dependencies'
3549
labels:
3650
- 'dependencies'

‎.github/workflows/browserstack.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ on:
44
push:
55

66
env:
7-
CI: true
87
FORCE_COLOR: 2
9-
NODE: 14.x
8+
NODE: 14
109

1110
jobs:
1211
browserstack:
@@ -19,18 +18,17 @@ jobs:
1918
uses: actions/checkout@v2
2019

2120
- name: Set up Node.js
22-
uses: actions/setup-node@v1
21+
uses: actions/setup-node@v2
2322
with:
2423
node-version: "${{ env.NODE }}"
2524

2625
- name: Set up npm cache
2726
uses: actions/cache@v2
2827
with:
2928
path: ~/.npm
30-
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
29+
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3130
restore-keys: |
32-
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
33-
${{ runner.OS }}-node-v${{ env.NODE }}-
31+
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3432
3533
- name: Install npm dependencies
3634
run: npm ci

‎.github/workflows/bundlewatch.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ name: Bundlewatch
22

33
on:
44
push:
5-
branches-ignore:
6-
- "dependabot/**"
75
pull_request:
86

97
env:
10-
CI: true
118
FORCE_COLOR: 2
12-
NODE: 14.x
9+
NODE: 14
1310

1411
jobs:
1512
bundlewatch:
@@ -20,18 +17,17 @@ jobs:
2017
uses: actions/checkout@v2
2118

2219
- name: Set up Node.js
23-
uses: actions/setup-node@v1
20+
uses: actions/setup-node@v2
2421
with:
2522
node-version: "${{ env.NODE }}"
2623

2724
- name: Set up npm cache
2825
uses: actions/cache@v2
2926
with:
3027
path: ~/.npm
31-
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
28+
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3229
restore-keys: |
33-
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
34-
${{ runner.OS }}-node-v${{ env.NODE }}-
30+
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3531
3632
- name: Install npm dependencies
3733
run: npm ci

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
branches:
1212
- main
1313
- v4-dev
14+
- "!dependabot/**"
1415
schedule:
1516
- cron: "0 2 * * 5"
1617

@@ -22,15 +23,6 @@ jobs:
2223
steps:
2324
- name: Checkout repository
2425
uses: actions/checkout@v2
25-
with:
26-
# We must fetch at least the immediate parents so that if this is
27-
# a pull request then we can checkout the head.
28-
fetch-depth: 2
29-
30-
# If this run was triggered by a pull request event, then checkout
31-
# the head of the pull request instead of the merge commit.
32-
- run: git checkout HEAD^2
33-
if: ${{ github.event_name == 'pull_request' }}
3426

3527
# Initializes the CodeQL tools for scanning.
3628
- name: Initialize CodeQL

‎.github/workflows/css.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ on:
77
pull_request:
88

99
env:
10-
CI: true
1110
FORCE_COLOR: 2
12-
NODE: 14.x
11+
NODE: 14
1312

1413
jobs:
1514
css:
@@ -20,18 +19,17 @@ jobs:
2019
uses: actions/checkout@v2
2120

2221
- name: Set up Node.js
23-
uses: actions/setup-node@v1
22+
uses: actions/setup-node@v2
2423
with:
2524
node-version: "${{ env.NODE }}"
2625

2726
- name: Set up npm cache
2827
uses: actions/cache@v2
2928
with:
3029
path: ~/.npm
31-
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
30+
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3231
restore-keys: |
33-
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
34-
${{ runner.OS }}-node-v${{ env.NODE }}-
32+
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3533
3634
- name: Install npm dependencies
3735
run: npm ci

‎.github/workflows/docs.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ on:
77
pull_request:
88

99
env:
10-
CI: true
1110
FORCE_COLOR: 2
12-
NODE: 14.x
11+
NODE: 14
1312

1413
jobs:
1514
docs:
@@ -20,7 +19,7 @@ jobs:
2019
uses: actions/checkout@v2
2120

2221
- name: Set up Node.js
23-
uses: actions/setup-node@v1
22+
uses: actions/setup-node@v2
2423
with:
2524
node-version: "${{ env.NODE }}"
2625

@@ -30,10 +29,9 @@ jobs:
3029
uses: actions/cache@v2
3130
with:
3231
path: ~/.npm
33-
key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
32+
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3433
restore-keys: |
35-
${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
36-
${{ runner.OS }}-node-v${{ env.NODE }}-
34+
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
3735
3836
- name: Install npm dependencies
3937
run: npm ci

0 commit comments

Comments
 (0)