Skip to content

Commit ca1d0c2

Browse files
Merge branch 'main' into main-jd-drop-node-sass-support
2 parents 76feb3a + 90acd33 commit ca1d0c2

File tree

31 files changed

+536
-448
lines changed

31 files changed

+536
-448
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2024 The Bootstrap Authors
3+
Copyright (c) 2011-2025 The Bootstrap Authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
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
@@ -243,4 +243,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
243243

244244
## Copyright and license
245245

246-
Code and documentation copyright 2011–2024 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). 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/).
246+
Code and documentation copyright 2011-2025 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). 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.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

build/change-version.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/*!
44
* Script to update version number references in the project.
5-
* Copyright 2017-2024 The Bootstrap Authors
5+
* Copyright 2017-2025 The Bootstrap Authors
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
77
*/
88

build/generate-sri.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Remember to use the same vendor files as the CDN ones,
66
* otherwise the hashes won't match!
77
*
8-
* Copyright 2017-2024 The Bootstrap Authors
8+
* Copyright 2017-2025 The Bootstrap Authors
99
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
1010
*/
1111

build/vnu-jar.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/*!
44
* Script to run vnu-jar if Java is available.
5-
* Copyright 2017-2024 The Bootstrap Authors
5+
* Copyright 2017-2025 The Bootstrap Authors
66
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
77
*/
88

build/zip-examples.mjs

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-2024 The Bootstrap Authors
6+
* Copyright 2020-2025 The Bootstrap Authors
77
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
88
*/
99

js/tests/helpers/fixture.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const fixtureId = 'fixture'
1+
const FIXTURE_ID = 'fixture'
22

33
export const getFixture = () => {
4-
let fixtureElement = document.getElementById(fixtureId)
4+
let fixtureElement = document.getElementById(FIXTURE_ID)
55

66
if (!fixtureElement) {
77
fixtureElement = document.createElement('div')
8-
fixtureElement.setAttribute('id', fixtureId)
8+
fixtureElement.setAttribute('id', FIXTURE_ID)
99
fixtureElement.style.position = 'absolute'
1010
fixtureElement.style.top = '-10000px'
1111
fixtureElement.style.left = '-10000px'

nuget/bootstrap.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<repository type="git" url="https://github.com/twbs/bootstrap.git" branch="main" />
1616
<icon>bootstrap.png</icon>
1717
<license type="expression">MIT</license>
18-
<copyright>Copyright 2011-2024</copyright>
18+
<copyright>Copyright 2011-2025</copyright>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2020
<tags>css mobile-first responsive front-end framework web</tags>
2121
<contentFiles>

nuget/bootstrap.sass.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<repository type="git" url="https://github.com/twbs/bootstrap.git" branch="main" />
1616
<icon>bootstrap.png</icon>
1717
<license type="expression">MIT</license>
18-
<copyright>Copyright 2011-2024</copyright>
18+
<copyright>Copyright 2011-2025</copyright>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2020
<tags>css sass mobile-first responsive front-end framework web</tags>
2121
<contentFiles>

0 commit comments

Comments
 (0)