Merge branch 'main' into main-his-hybrid-sticky-footer

.github/workflows/js.yml

@@ -49,6 +49,7 @@ jobs:
 
       - name: Run Coveralls
         uses: coverallsapp/github-action@v2
+        if: ${{ !github.event.repository.fork }}
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           path-to-lcov: "./js/coverage/lcov.info"

.github/workflows/pa11y.yml

@@ -32,7 +32,7 @@ jobs:
           node-version: "${{ env.NODE }}"
 
       - name: Set up npm cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}

.github/workflows/percy.yml

@@ -30,7 +30,7 @@ jobs:
           node-version: "${{ env.NODE }}"
 
       - name: Set up npm cache
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}

package.json

@@ -104,23 +104,23 @@
     "@popperjs/core": "^2.11.8"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.6",
-    "@babel/preset-env": "^7.23.6",
-    "@percy/cli": "^1.27.6",
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "@percy/cli": "^1.27.7",
     "@popperjs/core": "^2.11.8",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",
-    "@storybook/addon-a11y": "^7.6.7",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-themes": "^7.6.7",
-    "@storybook/html": "^7.6.7",
-    "@storybook/html-webpack5": "^7.6.7",
+    "@storybook/addon-a11y": "^7.6.12",
+    "@storybook/addon-essentials": "^7.6.12",
+    "@storybook/addon-themes": "^7.6.12",
+    "@storybook/html": "^7.6.12",
+    "@storybook/html-webpack5": "^7.6.12",
     "@storybook/preset-scss": "^1.0.3",
-    "@storybook/theming": "^7.6.7",
-    "autoprefixer": "^10.4.16",
+    "@storybook/theming": "^7.6.12",
+    "autoprefixer": "^10.4.17",
     "babel-loader": "^9.1.2",
     "bundlewatch": "^0.3.3",
     "clean-css-cli": "^5.6.3",
@@ -136,7 +136,7 @@
     "focus-visible": "^5.2.0",
     "globby": "^11.1.0",
     "hammer-simulator": "0.0.1",
-    "hugo-bin": "^0.118.0",
+    "hugo-bin": "^0.119.0",
     "ip": "^2.0.0",
     "jasmine": "^4.6.0",
     "jquery": "^3.7.1",
@@ -150,26 +150,26 @@
     "karma-jasmine-html-reporter": "^2.1.0",
     "karma-rollup-preprocessor": "7.0.7",
     "lockfile-lint": "^4.12.1",
-    "nodemon": "^3.0.2",
-    "npm-run-all2": "^6.1.1",
+    "nodemon": "^3.0.3",
+    "npm-run-all2": "^6.1.2",
     "ods-storybook-theme": "^1.1.0",
     "pa11y-ci": "^3.1.0",
     "pa11y-ci-reporter-html": "^6.0.2",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.33",
     "postcss-cli": "^11.0.0",
-    "rollup": "^4.9.1",
+    "rollup": "^4.9.6",
     "rollup-plugin-istanbul": "^5.0.0",
     "rtlcss": "^4.1.1",
-    "sass": "^1.69.5",
-    "sass-loader": "^13.3.3",
-    "sass-true": "^7.0.0",
+    "sass": "^1.70.0",
+    "sass-loader": "^14.0.0",
+    "sass-true": "^7.0.1",
     "shelljs": "^0.8.5",
     "sirv-cli": "^2.0.2",
-    "storybook": "^7.6.7",
-    "stylelint": "^16.0.2",
+    "storybook": "^7.6.12",
+    "stylelint": "^16.2.1",
     "stylelint-config-twbs-bootstrap": "^13.0.0",
-    "tarteaucitronjs": "^1.15.0",
-    "terser": "^5.26.0",
+    "tarteaucitronjs": "^1.16.1",
+    "terser": "^5.27.0",
     "vnu-jar": "^23.4.11"
   },
   "files": [

site/content/docs/5.3/migration.md

@@ -1923,7 +1923,7 @@ Want more information? [Read the v5.1.0 blog post.](https://blog.getbootstrap.co
 
 - <span class="badge text-bg-danger">Breaking</span> Media query mixins parameters have changed for a more logical approach.
   - `media-breakpoint-down()` uses the breakpoint itself instead of the next breakpoint (e.g., `media-breakpoint-down(lg)` instead of `media-breakpoint-down(md)` targets viewports smaller than `lg`).
-  - Similarly, the second parameter in `media-breakpoint-between()` also uses the breakpoint itself instead of the next breakpoint (e.g., `media-between(sm, lg)` instead of `media-breakpoint-between(sm, md)` targets viewports between `sm` and `lg`).
+  - Similarly, the second parameter in `media-breakpoint-between()` also uses the breakpoint itself instead of the next breakpoint (e.g., `media-breakpoint-between(sm, lg)` instead of `media-breakpoint-between(sm, md)` targets viewports between `sm` and `lg`).
 
 - <span class="badge text-bg-danger">Breaking</span> Removed print styles and `$enable-print-styles` variable. Print display classes are still around. [See #28339](https://github.com/twbs/bootstrap/pull/28339).
 

site/layouts/partials/header.html

@@ -29,4 +29,3 @@
 {{ partial "stylesheet" . }}
 {{ partial "favicons" . }}
 {{ partial "social" . }}
-{{ partial "analytics" . }}

site/layouts/partials/scripts.html

@@ -14,10 +14,7 @@
 {{- $js := resources.Match "js/*.js" -}}
 {{- $targetDocsJSPath := path.Join "/docs" .Site.Params.docs_version "assets/js/docs.js" -}}
 {{- $docsJs := append $js $vendor | resources.Concat $targetDocsJSPath -}}
-
-{{- if eq hugo.Environment "production" -}}
-  {{- $docsJs = $docsJs | resources.Minify -}}
-{{- end }}
+{{- $docsJs = $docsJs | resources.Minify -}}
 
 <script src="{{ $docsJs.Permalink | relURL }}"></script>
 

site/layouts/shortcodes/example.html

@@ -13,23 +13,23 @@
 {{- $id := .Get "id" -}}
 {{- $class := .Get "class" -}}
 {{- $lang := .Get "lang" | default "html" -}}
-{{- $stackblitz_add_js := .Get "stackblitz_add_js" | default false -}}
 {{- $show_markup := .Get "show_markup" | default true -}}
 {{- $show_preview := .Get "show_preview" | default true -}}
-{{- $input := .Inner -}}
+{{- $stackblitz_add_js := .Get "stackblitz_add_js" | default false -}}
+
 {{- $content := .Inner -}}
 
 <div class="bd-example-snippet bd-code-snippet">
-  {{- if eq $show_preview true -}}
+  {{- if eq $show_preview true }}
   <div{{ with $id }} id="{{ . }}"{{ end }} class="bd-example m-0 border-0{{ with $class }} {{ . }}{{ end }}">
-    {{- $input -}}
+    {{ $content }}
   </div>
-  {{- end -}}
+  {{- end }}
 
   {{- if eq $show_markup true -}}
     {{- if eq $show_preview true -}}
       <div class="d-flex align-items-center highlight-toolbar ps-3 pe-2 py-1 border-0 border-top border-bottom border-subtle border-1">
-        <small class="font-monospace text-body-secondary text-uppercase">{{- $lang -}}</small>
+        <small class="font-monospace text-body-secondary text-uppercase">{{ $lang }}</small>
         <div class="d-flex ms-auto">
           <button type="button" class="btn-edit text-nowrap"{{ with $stackblitz_add_js }} data-sb-js-snippet="{{ $stackblitz_add_js }}"{{ end }} title="Try it on StackBlitz">
             <svg class="bi" aria-hidden="true"><use xlink:href="#lightning-charge-fill"/></svg>
@@ -45,5 +45,5 @@
     {{- $content = replaceRE `<img class="bd-placeholder-img(?:-lg)?(?: *?bd-placeholder-img-lg)? ?(.*?)".*?>` `<img src="..." class="$1" alt="...">` $content -}}
     {{- $content = replaceRE ` (class=" *?")` "" $content -}}
     {{- highlight (trim $content "\n") $lang "" -}}
-  {{- end -}}
+  {{- end }}
 </div>