Skip to content

Commit fa682cb

Browse files
XhmikosRXhmikosR
authored
Merge branch 'main' into XhmikosR-patch-7
2 parents 2d30c7e + 80557b3 commit fa682cb

File tree

29 files changed

+120
-101
lines changed

29 files changed

+120
-101
lines changed

‎LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2020 Twitter, Inc.
4-
Copyright (c) 2011-2020 The Bootstrap Authors
3+
Copyright (c) 2011-2021 Twitter, Inc.
4+
Copyright (c) 2011-2021 The Bootstrap Authors
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
236236

237237
## Copyright and license
238238

239-
Code and documentation copyright 2011–2020 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
239+
Code and documentation copyright 2011–2021 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

‎build/build-plugins.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/*!
44
* Script to build our plugins to use them separately.
5-
* Copyright 2020 The Bootstrap Authors
6-
* Copyright 2020 Twitter, Inc.
5+
* Copyright 2020-2021 The Bootstrap Authors
6+
* Copyright 2020-2021 Twitter, Inc.
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
88
*/
99

‎build/change-version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/*!
44
* Script to update version number references in the project.
5-
* Copyright 2017-2020 The Bootstrap Authors
6-
* Copyright 2017-2020 Twitter, Inc.
5+
* Copyright 2017-2021 The Bootstrap Authors
6+
* Copyright 2017-2021 Twitter, Inc.
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
88
*/
99

‎build/generate-sri.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Remember to use the same vendor files as the CDN ones,
66
* otherwise the hashes won't match!
77
*
8-
* Copyright 2017-2020 The Bootstrap Authors
9-
* Copyright 2017-2020 Twitter, Inc.
8+
* Copyright 2017-2021 The Bootstrap Authors
9+
* Copyright 2017-2021 Twitter, Inc.
1010
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
1111
*/
1212

‎build/vnu-jar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
/*!
44
* Script to run vnu-jar if Java is available.
5-
* Copyright 2017-2020 The Bootstrap Authors
6-
* Copyright 2017-2020 Twitter, Inc.
5+
* Copyright 2017-2021 The Bootstrap Authors
6+
* Copyright 2017-2021 Twitter, Inc.
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
88
*/
99

‎build/zip-examples.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*!
44
* Script to create the built examples zip archive;
55
* requires the `zip` command to be present!
6-
* Copyright 2020 The Bootstrap Authors
6+
* Copyright 2020-2021 The Bootstrap Authors
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
88
*/
99

‎js/tests/unit/scrollspy.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('ScrollSpy', () => {
6868
fixtureEl.innerHTML = [
6969
'<nav id="navigation" class="navbar">',
7070
' <ul class="navbar-nav">',
71-
' <li class="nav-item active"><a class="nav-link" id="one-link" href="#">One</a></li>',
71+
' <li class="nav-item"><a class="nav-link active" id="one-link" href="#">One</a></li>',
7272
' <li class="nav-item"><a class="nav-link" id="two-link" href="#two">Two</a></li>',
7373
' <li class="nav-item"><a class="nav-link" id="three-link" href="#three">Three</a></li>',
7474
' </ul>',
@@ -177,7 +177,7 @@ describe('ScrollSpy', () => {
177177
'<div id="header" style="height: 500px;"></div>',
178178
'<nav id="navigation" class="navbar">',
179179
' <ul class="navbar-nav">',
180-
' <li class="nav-item active"><a class="nav-link" id="one-link" href="#one">One</a></li>',
180+
' <li class="nav-item"><a class="nav-link active" id="one-link" href="#one">One</a></li>',
181181
' <li class="nav-item"><a class="nav-link" id="two-link" href="#two">Two</a></li>',
182182
' <li class="nav-item"><a class="nav-link" id="three-link" href="#three">Three</a></li>',
183183
' </ul>',

‎js/tests/visual/dropdown.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
1818

1919
<div class="collapse navbar-collapse" id="navbarResponsive">
2020
<ul class="navbar-nav">
21-
<li class="nav-item active">
22-
<a class="nav-link" href="#" aria-current="page">Home</a>
21+
<li class="nav-item">
22+
<a class="nav-link active" href="#" aria-current="page">Home</a>
2323
</li>
2424
<li class="nav-item">
2525
<a class="nav-link" href="#">Link</a>

‎js/tests/visual/modal.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<div class="collapse navbar-expand-md" id="navbarResponsive">
1919
<a class="navbar-brand" href="#">This shouldn't jump!</a>
2020
<ul class="navbar-nav">
21-
<li class="nav-item active">
22-
<a class="nav-link" href="#" aria-current="page">Home</a>
21+
<li class="nav-item">
22+
<a class="nav-link active" href="#" aria-current="page">Home</a>
2323
</li>
2424
<li class="nav-item">
2525
<a class="nav-link" href="#">Link</a>

‎nuget/bootstrap.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<projectUrl>https://getbootstrap.com/</projectUrl>
1515
<icon>bootstrap.png</icon>
1616
<license type="file">LICENSE.txt</license>
17-
<copyright>Copyright 2017-2020</copyright>
17+
<copyright>Copyright 2017-2021</copyright>
1818
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1919
<tags>css mobile-first responsive front-end framework web</tags>
2020
<contentFiles>

‎nuget/bootstrap.sass.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<projectUrl>https://getbootstrap.com/</projectUrl>
1515
<icon>bootstrap.png</icon>
1616
<license type="file">LICENSE.txt</license>
17-
<copyright>Copyright 2017-2020</copyright>
17+
<copyright>Copyright 2017-2021</copyright>
1818
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1919
<tags>css sass mobile-first responsive front-end framework web</tags>
2020
<contentFiles>

‎package-lock.json

Lines changed: 21 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"@rollup/plugin-commonjs": "^17.0.0",
107107
"@rollup/plugin-node-resolve": "^11.0.1",
108108
"@rollup/plugin-replace": "^2.3.4",
109-
"autoprefixer": "^10.1.0",
109+
"autoprefixer": "^10.2.0",
110110
"bundlewatch": "^0.3.1",
111111
"clean-css-cli": "^4.3.0",
112112
"cross-env": "^7.0.3",

‎scss/bootstrap-grid.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap Grid v5.0.0-beta1 (https://getbootstrap.com/)
3-
* Copyright 2011-2020 The Bootstrap Authors
4-
* Copyright 2011-2020 Twitter, Inc.
3+
* Copyright 2011-2021 The Bootstrap Authors
4+
* Copyright 2011-2021 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
66
*/
77

‎scss/bootstrap-reboot.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap Reboot v5.0.0-beta1 (https://getbootstrap.com/)
3-
* Copyright 2011-2020 The Bootstrap Authors
4-
* Copyright 2011-2020 Twitter, Inc.
3+
* Copyright 2011-2021 The Bootstrap Authors
4+
* Copyright 2011-2021 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
66
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
77
*/

‎scss/bootstrap-utilities.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap Utilities v5.0.0-beta1 (https://getbootstrap.com/)
3-
* Copyright 2011-2020 The Bootstrap Authors
4-
* Copyright 2011-2020 Twitter, Inc.
3+
* Copyright 2011-2021 The Bootstrap Authors
4+
* Copyright 2011-2021 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
66
*/
77

‎scss/bootstrap.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap v5.0.0-beta1 (https://getbootstrap.com/)
3-
* Copyright 2011-2020 The Bootstrap Authors
4-
* Copyright 2011-2020 Twitter, Inc.
3+
* Copyright 2011-2021 The Bootstrap Authors
4+
* Copyright 2011-2021 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
66
*/
77

‎site/assets/js/application.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
/*!
66
* JavaScript for Bootstrap's docs (https://getbootstrap.com/)
7-
* Copyright 2011-2020 The Bootstrap Authors
8-
* Copyright 2011-2020 Twitter, Inc.
7+
* Copyright 2011-2021 The Bootstrap Authors
8+
* Copyright 2011-2021 Twitter, Inc.
99
* Licensed under the Creative Commons Attribution 3.0 Unported License.
1010
* For details, see https://creativecommons.org/licenses/by/3.0/.
1111
*/

‎site/assets/scss/docs.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap Docs (https://getbootstrap.com/)
3-
* Copyright 2011-2020 The Bootstrap Authors
4-
* Copyright 2011-2020 Twitter, Inc.
3+
* Copyright 2011-2021 The Bootstrap Authors
4+
* Copyright 2011-2021 Twitter, Inc.
55
* Licensed under the Creative Commons Attribution 3.0 Unported License.
66
* For details, see https://creativecommons.org/licenses/by/3.0/.
77
*/

‎site/content/docs/5.0/examples/navbar-bottom/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ <h1>Bottom Navbar example</h1>
1818
</button>
1919
<div class="collapse navbar-collapse" id="navbarCollapse">
2020
<ul class="navbar-nav">
21-
<li class="nav-item active">
22-
<a class="nav-link" aria-current="page" href="#">Home</a>
21+
<li class="nav-item">
22+
<a class="nav-link active" aria-current="page" href="#">Home</a>
2323
</li>
2424
<li class="nav-item">
2525
<a class="nav-link" href="#">Link</a>

‎site/content/docs/5.0/examples/navbar-fixed/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</button>
1414
<div class="collapse navbar-collapse" id="navbarCollapse">
1515
<ul class="navbar-nav me-auto mb-2 mb-md-0">
16-
<li class="nav-item active">
17-
<a class="nav-link" aria-current="page" href="#">Home</a>
16+
<li class="nav-item">
17+
<a class="nav-link active" aria-current="page" href="#">Home</a>
1818
</li>
1919
<li class="nav-item">
2020
<a class="nav-link" href="#">Link</a>

‎site/content/docs/5.0/examples/navbar-static/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</button>
1414
<div class="collapse navbar-collapse" id="navbarCollapse">
1515
<ul class="navbar-nav me-auto mb-2 mb-md-0">
16-
<li class="nav-item active">
17-
<a class="nav-link" aria-current="page" href="#">Home</a>
16+
<li class="nav-item">
17+
<a class="nav-link active" aria-current="page" href="#">Home</a>
1818
</li>
1919
<li class="nav-item">
2020
<a class="nav-link" href="#">Link</a>

0 commit comments

Comments
 (0)