Skip to content

Commit 29ea88c

Browse files
authored
Merge branch 'main' into patch-1
2 parents a5d6127 + e946bf7 commit 29ea88c

File tree

8 files changed

+1057
-1074
lines changed

8 files changed

+1057
-1074
lines changed

.bundlewatch.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"path": "./dist/js/bootstrap.bundle.min.js",
41-
"maxSize": "23.0 kB"
41+
"maxSize": "23.15 kB"
4242
},
4343
{
4444
"path": "./dist/js/bootstrap.esm.js",
@@ -54,7 +54,7 @@
5454
},
5555
{
5656
"path": "./dist/js/bootstrap.min.js",
57-
"maxSize": "16.0 kB"
57+
"maxSize": "16.1 kB"
5858
}
5959
],
6060
"ci": {

build/zip-examples.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ const imgFiles = [
3434
'bootstrap-logo.svg',
3535
'bootstrap-logo-white.svg'
3636
]
37+
const staticJsFiles = [
38+
'color-modes.js'
39+
]
3740

3841
sh.config.fatal = true
3942

@@ -52,7 +55,8 @@ sh.mkdir('-p', [
5255
distFolder,
5356
`${distFolder}/assets/brand/`,
5457
`${distFolder}/assets/dist/css/`,
55-
`${distFolder}/assets/dist/js/`
58+
`${distFolder}/assets/dist/js/`,
59+
`${distFolder}/assets/js/`
5660
])
5761

5862
sh.cp('-Rf', `${docsDir}/examples/*`, distFolder)
@@ -69,6 +73,10 @@ for (const file of imgFiles) {
6973
sh.cp('-f', `${docsDir}/assets/brand/${file}`, `${distFolder}/assets/brand/`)
7074
}
7175

76+
for (const file of staticJsFiles) {
77+
sh.cp('-f', `${docsDir}/assets/js/${file}`, `${distFolder}/assets/js/`)
78+
}
79+
7280
sh.rm(`${distFolder}/index.html`)
7381

7482
// get all examples' HTML files

package-lock.json

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

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"docs-serve": "hugo server --port 9001 --disableFastRender --printUnusedTemplates",
8383
"docs-serve-only": "npx sirv-cli _site --port 9001",
8484
"lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
85-
"update-deps": "ncu -u -x globby,jasmine,karma-browserstack-launcher,karma-rollup-preprocessor,terser && echo Manually update site/assets/js/vendor",
85+
"update-deps": "ncu -u -x globby,jasmine,karma-browserstack-launcher,karma-rollup-preprocessor && echo Manually update site/assets/js/vendor",
8686
"release": "npm-run-all dist release-sri docs-build release-zip*",
8787
"release-sri": "node build/generate-sri.js",
8888
"release-version": "node build/change-version.js",
@@ -103,9 +103,9 @@
103103
"@popperjs/core": "^2.11.7"
104104
},
105105
"devDependencies": {
106-
"@babel/cli": "^7.21.5",
107-
"@babel/core": "^7.22.1",
108-
"@babel/preset-env": "^7.22.4",
106+
"@babel/cli": "^7.22.5",
107+
"@babel/core": "^7.22.5",
108+
"@babel/preset-env": "^7.22.5",
109109
"@popperjs/core": "^2.11.8",
110110
"@rollup/plugin-babel": "^6.0.3",
111111
"@rollup/plugin-commonjs": "^25.0.0",
@@ -115,7 +115,7 @@
115115
"bundlewatch": "^0.3.3",
116116
"clean-css-cli": "^5.6.2",
117117
"cross-env": "^7.0.3",
118-
"eslint": "^8.42.0",
118+
"eslint": "^8.43.0",
119119
"eslint-config-xo": "^0.43.1",
120120
"eslint-plugin-html": "^7.1.0",
121121
"eslint-plugin-import": "^2.27.5",
@@ -142,15 +142,15 @@
142142
"npm-run-all2": "^6.0.5",
143143
"postcss": "^8.4.24",
144144
"postcss-cli": "^10.1.0",
145-
"rollup": "^3.23.1",
145+
"rollup": "^3.25.1",
146146
"rollup-plugin-istanbul": "^4.0.0",
147147
"rtlcss": "^4.1.0",
148148
"sass": "^1.62.1",
149149
"sass-true": "^7.0.0",
150150
"shelljs": "^0.8.5",
151-
"stylelint": "^15.7.0",
151+
"stylelint": "^15.8.0",
152152
"stylelint-config-twbs-bootstrap": "^10.0.0",
153-
"terser": "5.16.0",
153+
"terser": "^5.18.1",
154154
"vnu-jar": "23.4.11"
155155
},
156156
"files": [

site/content/docs/5.3/components/navs-tabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Take that same HTML, but use `.nav-underline` instead:
190190

191191
### Fill and justify
192192

193-
Force your `.nav`'s contents to extend the full available width one of two modifier classes. To proportionately fill all available space with your `.nav-item`s, use `.nav-fill`. Notice that all horizontal space is occupied, but not every nav item has the same width.
193+
Force your `.nav`'s contents to extend the full available width with one of two modifier classes. To proportionately fill all available space with your `.nav-item`s, use `.nav-fill`. Notice that all horizontal space is occupied, but not every nav item has the same width.
194194

195195
{{< example >}}
196196
<ul class="nav nav-pills nav-fill">

site/content/docs/5.3/components/tooltips.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const tooltip = new bootstrap.Tooltip('#example', {
157157
The required markup for a tooltip is only a `data` attribute and `title` on the HTML element you wish to have a tooltip. The generated markup of a tooltip is rather simple, though it does require a position (by default, set to `top` by the plugin).
158158

159159
{{< callout warning >}}
160-
**Keep tooltips accessible to keyboard and assistive technology users** by only adding them to HTML elements that are traditionally keyboard-focusable and interactive (such as links or form controls). While other HTML elements can be made focusable by adding `tabindex="0"`, this can create annoying and confusing tab stops on non-interactive elements for keyboard users, and most assistive technologies currently do not announce tooltips in this situation. Additionally, do not rely solely on `hover` as the trigger for your tooltips as this will make theme impossible to trigger for keyboard users.
160+
**Keep tooltips accessible to keyboard and assistive technology users** by only adding them to HTML elements that are traditionally keyboard-focusable and interactive (such as links or form controls). While other HTML elements can be made focusable by adding `tabindex="0"`, this can create annoying and confusing tab stops on non-interactive elements for keyboard users, and most assistive technologies currently do not announce tooltips in this situation. Additionally, do not rely solely on `hover` as the trigger for your tooltips as this will make them impossible to trigger for keyboard users.
161161
{{< /callout >}}
162162

163163
```html

site/content/docs/5.3/helpers/stacks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Using horizontal margin utilities like `.ms-auto` as spacers:
4242
{{< example class="bd-example-flex" >}}
4343
<div class="hstack gap-3">
4444
<div class="p-2">First item</div>
45-
<div class="p-2">Second item</div>
45+
<div class="p-2 ms-auto">Second item</div>
4646
<div class="p-2">Third item</div>
4747
</div>
4848
{{< /example >}}
@@ -52,7 +52,7 @@ And with [vertical rules]({{< docsref "/helpers/vertical-rule" >}}):
5252
{{< example class="bd-example-flex" >}}
5353
<div class="hstack gap-3">
5454
<div class="p-2">First item</div>
55-
<div class="p-2">Second item</div>
55+
<div class="p-2 ms-auto">Second item</div>
5656
<div class="vr"></div>
5757
<div class="p-2">Third item</div>
5858
</div>

site/data/docs-versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929

3030
- group: v3.x
3131
baseurl: "https://getbootstrap.com/docs"
32-
description: "Every minor and patch release from v3 is listed below. Last update was v3.4.1."
32+
description: "Every minor release from v3 is listed below. Last update was v3.4.1."
3333
versions:
3434
- "3.3"
3535
- "3.4"
3636

3737
- group: v4.x
3838
baseurl: "https://getbootstrap.com/docs"
39-
description: "Our previous major release with its minor releases. Last update was v4.6.0."
39+
description: "Our previous major release with its minor releases. Last update was v4.6.2."
4040
versions:
4141
- "4.0"
4242
- "4.1"

0 commit comments

Comments
 (0)