Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: twbs/bootstrap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: edf9c40956d19e6ab3f9151bfe0dfac6be06fa21
Choose a base ref
...
head repository: twbs/bootstrap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e1f75f420f68e1d52733b8e407fc7c3766c9dba
Choose a head ref

Commits on Jul 22, 2022

  1. Copy the full SHA
    04b5d09 View commit details
  2. Copy the full SHA
    d12bcf7 View commit details
  3. Copy the full SHA
    b6d2789 View commit details

Commits on Jul 25, 2022

  1. Correct heading levels in features example

    to keep the look the same, added `fs-...` sizing classes where necessary
    patrickhlauke authored and mdo committed Jul 25, 2022
    Copy the full SHA
    7688c84 View commit details
  2. Copy the full SHA
    e547c9c View commit details
  3. Copy the full SHA
    99cd8ca View commit details
  4. Copy the full SHA
    14e705d View commit details
  5. Copy the full SHA
    01bf7a9 View commit details
  6. Copy the full SHA
    dc901d2 View commit details
  7. Copy the full SHA
    a153f36 View commit details
  8. Remove Slack from site and repo docs (#36825)

    * Remove Slack from site and repo docs
    
    * Apply suggestions from code review
    
    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    
    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    mdo and julien-deramond authored Jul 25, 2022
    Copy the full SHA
    00aa1a5 View commit details

Commits on Jul 26, 2022

  1. Simplify social images and add ability to set per-page images (#36804)

    * Simplify social images and add ability to set per-page images
    
    - Removes the homepage summary layout in favor of the larger image card (makes it more consistent with other pages)
    - Reuses new thumbnails for Webpack, Parcel, and Vite guides to add their new social images
    
    * Update default social card
    
    * Change description to subtitle, add longer description to match homepage
    
    * Remove social_image_path, use inline conditions for social images
    mdo authored Jul 26, 2022
    Copy the full SHA
    501faa2 View commit details

Commits on Jul 27, 2022

  1. Bump lockfile-lint from 4.7.6 to 4.7.7 (#36844)

    Bumps [lockfile-lint](https://github.com/lirantal/lockfile-lint) from 4.7.6 to 4.7.7.
    - [Release notes](https://github.com/lirantal/lockfile-lint/releases)
    - [Commits](https://github.com/lirantal/lockfile-lint/compare/lockfile-lint@4.7.6...lockfile-lint@4.7.7)
    
    ---
    updated-dependencies:
    - dependency-name: lockfile-lint
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 27, 2022
    Copy the full SHA
    02f1c62 View commit details
  2. Bump sass from 1.53.0 to 1.54.0 (#36845)

    Bumps [sass](https://github.com/sass/dart-sass) from 1.53.0 to 1.54.0.
    - [Release notes](https://github.com/sass/dart-sass/releases)
    - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
    - [Commits](sass/dart-sass@1.53.0...1.54.0)
    
    ---
    updated-dependencies:
    - dependency-name: sass
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Jul 27, 2022
    Copy the full SHA
    44c9c8d View commit details
  3. Re-set tooltip title, on disposal (#36751)

    fix(reg): Re-set tooltip title, on disposal
    GeoSot authored Jul 27, 2022
    Copy the full SHA
    dfae892 View commit details
  4. Copy the full SHA
    3feaf6c View commit details

Commits on Jul 28, 2022

  1. Copy the full SHA
    90c50ab View commit details
  2. ScrollSpy: make the threshold option configurable (#36750)

    * feat(ScrollSpy): make the threshold option configurable
    GeoSot authored Jul 28, 2022
    Copy the full SHA
    db86607 View commit details

Commits on Jul 29, 2022

  1. Copy the full SHA
    17aa673 View commit details
  2. Copy the full SHA
    8553030 View commit details

Commits on Jul 31, 2022

  1. Copy the full SHA
    a4f81c0 View commit details

Commits on Aug 1, 2022

  1. Fix floating labels

    louismaximepiton authored and mdo committed Aug 1, 2022
    Copy the full SHA
    c22dd50 View commit details
  2. Fix docs typo of .form-checkbox -> .form-check

    The class `.form-checkbox` is not used in Bootstrap and here it should say `.form-check` (as shown in the example below).
    mwest1066 authored and mdo committed Aug 1, 2022
    Copy the full SHA
    7432f2a View commit details
  3. Fix

    louismaximepiton authored and mdo committed Aug 1, 2022
    Copy the full SHA
    6c221aa View commit details

Commits on Aug 3, 2022

  1. Expand popover custom container explanation

    mention the scenario of popovers inside modals - see #36692 (comment)
    patrickhlauke authored and mdo committed Aug 3, 2022
    Copy the full SHA
    4018fac View commit details
  2. fix #36662 List-group-item margin-top is offset when importing sass i…

    …n a nested class (#36663)
    
    * fix #36662 & + .list-group-item
    
    * Ignore linter
    
    Co-authored-by: Mark Otto <otto@github.com>
    hadouin and mdo authored Aug 3, 2022
    Copy the full SHA
    8730ef0 View commit details
  3. Docs: add grid-row-columns variable

    hadouin authored and mdo committed Aug 3, 2022
    Copy the full SHA
    e57a94c View commit details

Commits on Aug 4, 2022

  1. Added new example in examples/features page. (#36660)

    * Added new example in examples/features
    
    * Fix indentation, other suggested changes from review
    
    * fix: heading structure
    thevipinmishra authored Aug 4, 2022
    Copy the full SHA
    9e57dfa View commit details
  2. Bump rollup from 2.77.0 to 2.77.2 (#36886)

    Bumps [rollup](https://github.com/rollup/rollup) from 2.77.0 to 2.77.2.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v2.77.0...v2.77.2)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 4, 2022
    Copy the full SHA
    aad77f3 View commit details
  3. Update devDependencies (#36900)

    * @babel/cli             ^7.18.9  →  ^7.18.10
    * @babel/core            ^7.18.9  →  ^7.18.10
    * @babel/preset-env      ^7.18.9  →  ^7.18.10
    * eslint                 ^8.20.0  →   ^8.21.0
    * sass                   ^1.54.0  →   ^1.54.2
    XhmikosR authored Aug 4, 2022
    Copy the full SHA
    a685b96 View commit details

Commits on Aug 10, 2022

  1. Copy the full SHA
    c3c6591 View commit details

Commits on Aug 29, 2022

  1. Bump @rollup/plugin-commonjs from 22.0.1 to 22.0.2 (#36929)

    Bumps [@rollup/plugin-commonjs](https://github.com/rollup/plugins/tree/HEAD/packages/commonjs) from 22.0.1 to 22.0.2.
    - [Release notes](https://github.com/rollup/plugins/releases)
    - [Changelog](https://github.com/rollup/plugins/blob/master/packages/commonjs/CHANGELOG.md)
    - [Commits](https://github.com/rollup/plugins/commits/commonjs-v22.0.2/packages/commonjs)
    
    ---
    updated-dependencies:
    - dependency-name: "@rollup/plugin-commonjs"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 29, 2022
    Copy the full SHA
    af1bd97 View commit details

Commits on Aug 31, 2022

  1. Copy the full SHA
    29332a9 View commit details

Commits on Sep 1, 2022

  1. Copy the full SHA
    1531867 View commit details
  2. Copy the full SHA
    995df35 View commit details
  3. Add a comment for track the bug.

    louismaximepiton authored and mdo committed Sep 1, 2022
    Copy the full SHA
    4cea8b1 View commit details
  4. Copy the full SHA
    a0238d1 View commit details
  5. Copy the full SHA
    465cc2d View commit details
  6. Copy the full SHA
    bc2ec7c View commit details
  7. Copy the full SHA
    a138bc3 View commit details
  8. Fix for horizontal list-group item

    louismaximepiton authored and mdo committed Sep 1, 2022
    Copy the full SHA
    ebbed79 View commit details
  9. Copy the full SHA
    2f3aec8 View commit details
  10. Add default select example in cheatsheet (#36877)

    Co-authored-by: Julien Déramond <julien.deramond@orange.com>
    florianlacreuse and julien-deramond authored Sep 1, 2022
    Copy the full SHA
    87aaf94 View commit details
  11. v5/docs: reintroduce outline for docs code samples, buttons when `:…

    …not(:focus-visible)` (#36507)
    
    * Remove outline suppression for focused `<pre>`
    
    Sighted keyboard users rely on knowing where their focus is. If the `<pre>` receives focus (so that it can be scrolled by keyboard users, for instance) then it's essential that they know this is the case
    
    * Only suppress outline for buttons when `:not(:focus-visible)`
    
    * Add right-hand margin to pre
    
    avoids having the focus outline awkwardly clipped by the copy button
    patrickhlauke authored Sep 1, 2022
    Copy the full SHA
    cda901f View commit details
  12. Update dependencies

    mdo committed Sep 1, 2022
    Copy the full SHA
    db34907 View commit details
  13. Fix padding on starter template

    mdo committed Sep 1, 2022
    Copy the full SHA
    a12453a View commit details
  14. Copy the full SHA
    3ad8551 View commit details
  15. Copy the full SHA
    b14190b View commit details
  16. Fix

    louismaximepiton authored and mdo committed Sep 1, 2022
    Copy the full SHA
    77e17e3 View commit details
  17. Replace wrong mobile OS Windows with iOS

    hfhbd authored and mdo committed Sep 1, 2022
    Copy the full SHA
    b5f2d5a View commit details
Showing 736 changed files with 31,299 additions and 21,698 deletions.
24 changes: 12 additions & 12 deletions .bundlewatch.config.json
Original file line number Diff line number Diff line change
@@ -2,55 +2,55 @@
"files": [
{
"path": "./dist/css/bootstrap-grid.css",
"maxSize": "7.5 kB"
"maxSize": "6.5 kB"
},
{
"path": "./dist/css/bootstrap-grid.min.css",
"maxSize": "6.55 kB"
"maxSize": "6.0 kB"
},
{
"path": "./dist/css/bootstrap-reboot.css",
"maxSize": "2.75 kB"
"maxSize": "3.5 kB"
},
{
"path": "./dist/css/bootstrap-reboot.min.css",
"maxSize": "2.5 kB"
"maxSize": "3.25 kB"
},
{
"path": "./dist/css/bootstrap-utilities.css",
"maxSize": "8.0 kB"
"maxSize": "11.75 kB"
},
{
"path": "./dist/css/bootstrap-utilities.min.css",
"maxSize": "7.25 kB"
"maxSize": "10.75 kB"
},
{
"path": "./dist/css/bootstrap.css",
"maxSize": "28.75 kB"
"maxSize": "32.5 kB"
},
{
"path": "./dist/css/bootstrap.min.css",
"maxSize": "26.75 kB"
"maxSize": "30.25 kB"
},
{
"path": "./dist/js/bootstrap.bundle.js",
"maxSize": "43.0 kB"
},
{
"path": "./dist/js/bootstrap.bundle.min.js",
"maxSize": "22.75 kB"
"maxSize": "23.25 kB"
},
{
"path": "./dist/js/bootstrap.esm.js",
"maxSize": "27.75 kB"
"maxSize": "28.0 kB"
},
{
"path": "./dist/js/bootstrap.esm.min.js",
"maxSize": "18.5 kB"
"maxSize": "18.25 kB"
},
{
"path": "./dist/js/bootstrap.js",
"maxSize": "28.5 kB"
"maxSize": "28.75 kB"
},
{
"path": "./dist/js/bootstrap.min.js",
4 changes: 3 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
"autohiding",
"autoplay",
"autoplays",
"autoplaying",
"blazingly",
"Blockquotes",
"Bootstrappers",
@@ -39,6 +40,7 @@
"dropright",
"dropstart",
"dropup",
"dgst",
"errorf",
"favicon",
"favicons",
@@ -76,7 +78,6 @@
"Packagist",
"popperjs",
"prebuild",
"precompiled",
"prefersreducedmotion",
"prepended",
"printf",
@@ -108,6 +109,7 @@
"unstyled",
"Uppercased",
"urlize",
"urlquery",
"vbtn",
"viewports",
"Vite",
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -4,3 +4,4 @@
/_site/
/js/coverage/
/site/static/sw.js
/site/layouts/partials/
159 changes: 158 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -14,6 +14,35 @@
"error",
"never"
],
"import/extensions": [
"error",
"ignorePackages",
{
"js": "always"
}
],
"import/first": "error",
"import/newline-after-import": "error",
"import/no-absolute-path": "error",
"import/no-amd": "error",
"import/no-cycle": [
"error",
{
"ignoreExternal": true
}
],
"import/no-duplicates": "error",
"import/no-extraneous-dependencies": "error",
"import/no-mutable-exports": "error",
"import/no-named-as-default": "error",
"import/no-named-as-default-member": "error",
"import/no-named-default": "error",
"import/no-self-import": "error",
"import/no-unassigned-import": [
"error"
],
"import/no-useless-path-segments": "error",
"import/order": "error",
"indent": [
"error",
2,
@@ -22,6 +51,7 @@
"SwitchCase": 1
}
],
"logical-assignment-operators": "off",
"max-params": [
"warn",
5
@@ -46,20 +76,147 @@
"error",
"after"
],
"prefer-object-has-own": "off",
"prefer-template": "error",
"semi": [
"error",
"never"
],
"strict": "error",
"unicorn/explicit-length-check": "off",
"unicorn/filename-case": "off",
"unicorn/no-array-callback-reference": "off",
"unicorn/no-array-method-this-argument": "off",
"unicorn/no-null": "off",
"unicorn/no-typeof-undefined": "off",
"unicorn/no-unused-properties": "error",
"unicorn/numeric-separators-style": "off",
"unicorn/prefer-array-flat": "off",
"unicorn/prefer-at": "off",
"unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-module": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-spread": "off",
"unicorn/prefer-string-replace-all": "off",
"unicorn/prevent-abbreviations": "off"
}
},
"overrides": [
{
"files": [
"build/**"
],
"env": {
"browser": false,
"node": true
},
"parserOptions": {
"sourceType": "module"
},
"rules": {
"no-console": "off",
"unicorn/prefer-top-level-await": "off"
}
},
{
"files": [
"js/**"
],
"parserOptions": {
"sourceType": "module"
}
},
{
"files": [
"js/tests/*.js",
"js/tests/integration/rollup*.js"
],
"env": {
"node": true
},
"parserOptions": {
"sourceType": "script"
}
},
{
"files": [
"js/tests/unit/**"
],
"env": {
"jasmine": true
},
"rules": {
"no-console": "off",
"unicorn/consistent-function-scoping": "off",
"unicorn/no-useless-undefined": "off",
"unicorn/prefer-add-event-listener": "off"
}
},
{
"files": [
"js/tests/visual/**"
],
"plugins": [
"html"
],
"settings": {
"html/html-extensions": [
".html"
]
},
"rules": {
"no-console": "off",
"no-new": "off",
"unicorn/no-array-for-each": "off"
}
},
{
"files": [
"scss/tests/**"
],
"env": {
"node": true
},
"parserOptions": {
"sourceType": "script"
}
},
{
"files": [
"site/**"
],
"env": {
"browser": true,
"node": false
},
"parserOptions": {
"sourceType": "script",
"ecmaVersion": 2019
},
"rules": {
"no-new": "off",
"unicorn/no-array-for-each": "off"
}
},
{
"files": [
"**/*.md"
],
"plugins": [
"markdown"
],
"processor": "markdown/markdown"
},
{
"files": [
"**/*.md/*.js"
],
"extends": "plugin:markdown/recommended",
"parserOptions": {
"sourceType": "module"
},
"rules": {
"unicorn/prefer-node-protocol": "off"
}
}
]
}
27 changes: 16 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -18,21 +18,26 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat
and [submitting pull requests](#pull-requests), but please respect the following
restrictions:

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

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

* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
- Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
instead. We reserve the right to delete comments which violate this rule.

* Please **do not** open issues regarding the official themes offered on <https://themes.getbootstrap.com/>.
- Please **do not** open issues regarding the official themes offered on <https://themes.getbootstrap.com/>.
Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`.


## Issues assignment

The core team will be looking at the open issues, analyze them, and provide guidance on how to proceed. **Issues won't be assigned to anyone outside the core team.** However, contributors are welcome to participate in the discussion and provide their input on how to best solve the issue, and even submit a PR if they want to. Please wait that the issue is ready to be worked on before submitting a PR, we don't want to waste your time.

Please keep in mind that the core team is small, has limited resources and that we are not always able to respond immediately. We will try to provide feedback as soon as possible, but please be patient. If you don't get a response immediately, it doesn't mean that we are ignoring you or that we don't care about your issue or PR. We will get back to you as soon as we can.


## Issues and labels

Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
@@ -103,16 +108,16 @@ Sometimes bugs reported to us are actually caused by bugs in the browser(s) them

| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------ | -------------------------------------------------------- |
| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit | In Apple's bug reporter, choose "Safari" as the product. |
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://bugs.chromium.org/p/chromium/issues/list | Click the "New issue" button. |
| Microsoft | Edge | Blink | https://developer.microsoft.com/en-us/microsoft-edge/ | Go to "Help > Send Feedback" from the browser |
| Mozilla | Firefox | Gecko | <https://bugzilla.mozilla.org/enter_bug.cgi> | "Core" is normally the right product option to choose. |
| Apple | Safari | WebKit | <https://bugs.webkit.org/enter_bug.cgi?product=WebKit> | In Apple's bug reporter, choose "Safari" as the product. |
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | <https://bugs.chromium.org/p/chromium/issues/list> | Click the "New issue" button. |
| Microsoft | Edge | Blink | <https://developer.microsoft.com/en-us/microsoft-edge/> | Go to "Help > Send Feedback" from the browser |


## Feature requests

Feature requests are welcome. But take a moment to find out whether your idea
fits with the scope and aims of the project. It's up to *you* to make a strong
fits with the scope and aims of the project. It's up to _you_ to make a strong
case to convince the project's developers of the merits of this feature. Please
provide as much detail and context as possible.

38 changes: 38 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
### Description

<!-- Describe your changes in detail -->

### Motivation & Context

<!-- Why is this change required? What problem does it solve? -->

### Type of changes

<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactoring (non-breaking change)
- [ ] Breaking change (fix or feature that would change existing functionality)

### Checklist

<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] I have read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/main/.github/CONTRIBUTING.md)
- [ ] My code follows the code style of the project _(using `npm run lint`)_
- [ ] My change introduces changes to the documentation
- [ ] I have updated the documentation accordingly
- [ ] I have added tests to cover my changes
- [ ] All new and existing tests passed

#### Live previews

<!-- Please add direct links where your modifications can be seen in the documentation -->

- <https://deploy-preview-{your_pr_number}--twbs-bootstrap.netlify.app/>

### Related issues

<!-- Please link any related issues here. -->
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.

For general troubleshooting or help getting started:

- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.
Loading