Skip to content

Commit dcbdb96

Browse files
Merge branch 'main' into a11y-pagination-current-page
2 parents 22a8f02 + 99a0dc6 commit dcbdb96

File tree

175 files changed

+2294
-1712
lines changed

Some content is hidden

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

175 files changed

+2294
-1712
lines changed

.browserslistrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ Firefox ESR
99
iOS >= 12
1010
Safari >= 12
1111
not Explorer <= 11
12+
not kaios <= 2.5 # fix floating label issues in Firefox (see https://github.com/postcss/autoprefixer/issues/1533)

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"roboto",
8888
"RTLCSS",
8989
"ruleset",
90+
"sassrc",
9091
"screenreaders",
9192
"scrollbars",
9293
"scrollspy",

.github/CONTRIBUTING.md

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,33 +172,47 @@ included in the project:
172172
git pull upstream main
173173
```
174174

175-
3. Create a new topic branch (off the main project development branch) to
175+
3. Install or update project dependencies with npm:
176+
177+
```bash
178+
npm install
179+
```
180+
181+
4. Create a new topic branch (off the main project development branch) to
176182
contain your feature, change, or fix:
177183

178184
```bash
179185
git checkout -b <topic-branch-name>
180186
```
181187

182-
4. Commit your changes in logical chunks. Please adhere to these [git commit
188+
5. Commit your changes in logical chunks. Please adhere to these [git commit
183189
message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
184190
or your code is unlikely be merged into the main project. Use Git's
185191
[interactive rebase](https://help.github.com/articles/about-git-rebase/)
186192
feature to tidy up your commits before making them public.
187193

188-
5. Locally merge (or rebase) the upstream development branch into your topic branch:
194+
6. Ensure your changes compile the dist CSS and JS files in the `dist/` directory. Verify
195+
the build succeeds locally without errors.
196+
197+
```bash
198+
npm run dist
199+
```
200+
201+
7. Locally merge (or rebase) the upstream development branch into your topic branch:
189202

190203
```bash
191204
git pull [--rebase] upstream main
192205
```
193206

194-
6. Push your topic branch up to your fork:
207+
8. Commit your changes, but **do not push compiled CSS and JS files in `dist` and `js/dist`**.
208+
Push your topic branch up to your fork:
195209

196210
```bash
197211
git push origin <topic-branch-name>
198212
```
199213

200-
7. [Open a Pull Request](https://help.github.com/articles/about-pull-requests/)
201-
with a clear title and description against the `main` branch.
214+
9. [Open a pull request](https://help.github.com/articles/about-pull-requests/)
215+
with a clear title and description against the `main` branch.
202216

203217
**IMPORTANT**: By submitting a patch, you agree to allow the project owners to
204218
license your work under the terms of the [MIT License](../LICENSE) (if it

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: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ 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.3.3.zip)
49+
- [Download the latest release](https://github.com/twbs/bootstrap/archive/v5.3.5.zip)
5050
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
51-
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@v5.3.3`
52-
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@v5.3.3`
53-
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.3.3`
51+
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@v5.3.5`
52+
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@v5.3.5`
53+
- Install with [Bun](https://bun.sh/): `bun add bootstrap@v5.3.5`
54+
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.3.5`
5455
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`
5556

5657
Read the [Getting started page](https://getbootstrap.com/docs/5.3/getting-started/introduction/) for information on the framework contents, templates, examples, and more.
@@ -174,7 +175,7 @@ Editor preferences are available in the [editor config](https://github.com/twbs/
174175

175176
Get updates on Bootstrap's development and chat with the project maintainers and community members.
176177

177-
- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
178+
- Follow [@getbootstrap on X](https://x.com/getbootstrap).
178179
- Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/).
179180
- Ask questions and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
180181
- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://www.reddit.com/r/bootstrap/).
@@ -194,12 +195,12 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr
194195

195196
**Mark Otto**
196197

197-
- <https://twitter.com/mdo>
198+
- <https://x.com/mdo>
198199
- <https://github.com/mdo>
199200

200201
**Jacob Thornton**
201202

202-
- <https://twitter.com/fat>
203+
- <https://x.com/fat>
203204
- <https://github.com/fat>
204205

205206

@@ -243,4 +244,4 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
243244

244245
## Copyright and license
245246

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/).
247+
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

dist/css/bootstrap-grid.css

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

dist/css/bootstrap-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.min.css

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

dist/css/bootstrap-grid.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.rtl.css

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

dist/css/bootstrap-grid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-grid.rtl.min.css

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

dist/css/bootstrap-grid.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.css

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

dist/css/bootstrap-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.min.css

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

dist/css/bootstrap-reboot.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-reboot.rtl.css

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

dist/css/bootstrap-reboot.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)