Skip to content

Commit

Permalink
chore(merge main): patched commit → ec96eac (#2809)
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton authored Dec 10, 2024
1 parent b6115cb commit 9fd160e
Show file tree
Hide file tree
Showing 7 changed files with 969 additions and 937 deletions.
1,866 changes: 942 additions & 924 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@
"watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm-run-all js-lint js-compile\"",
"watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\"",
"storybook": "npm run storybook-generate && storybook dev -p 6006",
"storybook-generate": "npm run docs && node stories/create-stories-from-doc.js",
"storybook-generate": "npm run docs-build && node stories/create-stories-from-doc.js",
"storybook-build": "npm run storybook-generate && storybook build -o ./_site/storybook",
"storybook-build-netlify": "npm run storybook-generate && storybook build -o ./site/storybook"
},
"peerDependencies": {
"@popperjs/core": "^2.11.8"
},
"devDependencies": {
"@babel/cli": "^7.25.7",
"@babel/core": "^7.25.8",
"@babel/preset-env": "^7.25.8",
"@docsearch/js": "^3.6.2",
"@babel/cli": "^7.25.9",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@docsearch/js": "^3.7.0",
"@percy/cli": "^1.30.4",
"@popperjs/core": "^2.11.8",
"@rollup/plugin-babel": "^6.0.4",
Expand Down Expand Up @@ -139,7 +139,7 @@
"focus-visible": "^5.2.1",
"globby": "^14.0.2",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.133.1",
"hugo-bin": "^0.134.1",
"ip": "^2.0.0",
"jasmine": "^5.3.0",
"jquery": "^3.7.1",
Expand All @@ -154,13 +154,13 @@
"karma-rollup-preprocessor": "7.0.7",
"lockfile-lint": "^4.14.0",
"nodemon": "^3.1.7",
"npm-run-all2": "^6.2.3",
"npm-run-all2": "^7.0.1",
"ods-storybook-theme": "^1.1.0",
"pa11y-ci": "^3.1.0",
"pa11y-ci-reporter-html": "^7.0.0",
"postcss": "^8.4.47",
"postcss-cli": "^11.0.0",
"rollup": "^4.24.0",
"rollup": "^4.24.4",
"rollup-plugin-istanbul": "^5.0.0",
"rtlcss": "^4.3.0",
"sass": "1.78.0",
Expand All @@ -173,7 +173,7 @@
"stylelint-config-twbs-bootstrap": "^15.1.0",
"tarteaucitronjs": "^1.19.0",
"terser": "^5.36.0",
"vnu-jar": "^23.4.11"
"vnu-jar": "24.10.17"
},
"files": [
"dist/{css,js,fonts}/*.{css,js,map,svg,woff2}",
Expand Down
2 changes: 2 additions & 0 deletions site/assets/scss/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// Boosted mod: no background-color
// Boosted mod: no box-shadow

// Boosted mod: no `@media (forced-color)`

// Boosted mod: no `&::after`

// Boosted mod: no .bd-navbar-toggle
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.3/components/dropdowns.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ toc: true

## Overview

Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Boosted dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision](https://markdotto.com/2012/02/27/bootstrap-explained-dropdowns/).
Dropdowns are toggleable, contextual overlays for displaying lists of links and more. They're made interactive with the included Boosted dropdown JavaScript plugin. They're toggled by clicking, not by hovering; this is [an intentional design decision](https://markdotto.com/blog/bootstrap-explained-dropdowns/).

Dropdowns are built on a third party library, [Popper](https://popper.js.org/docs/v2/), which provides dynamic positioning and viewport detection. Be sure to include [popper.min.js]({{< param "cdn.popper" >}}) before Boosted's JavaScript or use `boosted.bundle.min.js` / `boosted.bundle.js` which contains Popper. Popper isn't used to position dropdowns in navbars though as dynamic positioning isn't required.

Expand Down
10 changes: 10 additions & 0 deletions site/content/docs/5.3/getting-started/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ Install Boosted in your Node.js powered apps with [the yarn package](https://yar
yarn add boosted@{{< param "current_version" >}}
```

{{< callout warning >}}
**Yarn 2+ (aka Yarn Berry) doesn't support the `node_modules` directory by default**: using the [twbs/examples Sass & JS example](https://github.com/twbs/examples/tree/main/sass-js) needs some adjustments:
```sh
yarn config set nodeLinker node-modules # Use the node_modules linker
touch yarn.lock # Create an empty yarn.lock file
yarn install # Install the dependencies
yarn start # Start the project
```
{{< /callout >}}

### Composer

You can also install and manage Boosted's Sass and JavaScript using [Composer](https://getcomposer.org/):
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.3/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ Want more information? [Read the v5.1.0 blog post.](https://blog.getbootstrap.co

- Columns no longer have `position: relative` applied, so you may have to add `.position-relative` to some elements to restore that behavior.

- <span class="badge text-bg-danger">Breaking</span> Dropped several `.order-*` classes that often went unused. We now only provide `.order-1` to `.order-5` out of the box.
- <span class="badge text-bg-danger">Breaking</span> Dropped several `.order-*` classes that often went unused. We now only provide `.order-0` to `.order-5` out of the box.

- <span class="badge text-bg-danger">Breaking</span> Dropped the `.media` component as it can be easily replicated with utilities. [See #28265](https://github.com/twbs/bootstrap/pull/28265) and the [flex utilities page for an example]({{< docsref "/utilities/flex#media-object" >}}).

Expand Down
6 changes: 4 additions & 2 deletions site/content/docs/5.3/utilities/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ You can enable responsive classes for an existing set of utilities that are not
@import "boosted/scss/utilities";

$utilities: map-merge(
$utilities, (
$utilities,
(
"border": map-merge(
map-get($utilities, "border"),
( responsive: true ),
Expand Down Expand Up @@ -512,7 +513,8 @@ Missing v4 utilities, or used to another naming convention? The utilities API ca
@import "boosted/scss/utilities";

$utilities: map-merge(
$utilities, (
$utilities,
(
"margin-start": map-merge(
map-get($utilities, "margin-start"),
( class: ml ),
Expand Down

0 comments on commit 9fd160e

Please sign in to comment.