1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 18:44:01 +02:00

Merge branch 'main' into main-lmp-contextual-theme-switcher

This commit is contained in:
louismaxime.piton
2023-10-23 14:24:27 +02:00
5 changed files with 47 additions and 43 deletions

View File

@@ -13,21 +13,25 @@
</style> </style>
</head> </head>
<body> <body>
<nav class="navbar navbar-full navbar-dark bg-dark"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<button class="navbar-toggler hidden-lg-up" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button> <div class="container-fluid">
<div class="collapse navbar-expand-md" id="navbarResponsive"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<a class="navbar-brand" href="#">This shouldn't jump!</a> <span class="navbar-toggler-icon"></span>
<ul class="navbar-nav"> </button>
<li class="nav-item"> <div class="collapse navbar-collapse" id="navbarResponsive">
<a class="nav-link active" href="#" aria-current="page">Home</a> <a class="navbar-brand" href="#">This shouldn't jump!</a>
</li> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#">Link</a> <a class="nav-link active" href="#" aria-current="page">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#">Link</a> <a class="nav-link" href="#">Link</a>
</li> </li>
</ul> <li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
</ul>
</div>
</div> </div>
</nav> </nav>

48
package-lock.json generated
View File

@@ -27,7 +27,7 @@
"@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1", "@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-replace": "^5.0.2",
"autoprefixer": "^10.4.15", "autoprefixer": "^10.4.16",
"bundlewatch": "^0.3.3", "bundlewatch": "^0.3.3",
"clean-css-cli": "^5.6.2", "clean-css-cli": "^5.6.2",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
@@ -56,7 +56,7 @@
"lockfile-lint": "^4.12.1", "lockfile-lint": "^4.12.1",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"npm-run-all2": "^6.0.6", "npm-run-all2": "^6.0.6",
"postcss": "^8.4.30", "postcss": "^8.4.31",
"postcss-cli": "^10.1.0", "postcss-cli": "^10.1.0",
"rollup": "^3.29.3", "rollup": "^3.29.3",
"rollup-plugin-istanbul": "^4.0.0", "rollup-plugin-istanbul": "^4.0.0",
@@ -2879,9 +2879,9 @@
} }
}, },
"node_modules/autoprefixer": { "node_modules/autoprefixer": {
"version": "10.4.15", "version": "10.4.16",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
"integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==", "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -2899,8 +2899,8 @@
], ],
"dependencies": { "dependencies": {
"browserslist": "^4.21.10", "browserslist": "^4.21.10",
"caniuse-lite": "^1.0.30001520", "caniuse-lite": "^1.0.30001538",
"fraction.js": "^4.2.0", "fraction.js": "^4.3.6",
"normalize-range": "^0.1.2", "normalize-range": "^0.1.2",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"postcss-value-parser": "^4.2.0" "postcss-value-parser": "^4.2.0"
@@ -3507,9 +3507,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001534", "version": "1.0.30001547",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz",
"integrity": "sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==", "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -8579,9 +8579,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.30", "version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -13461,14 +13461,14 @@
"dev": true "dev": true
}, },
"autoprefixer": { "autoprefixer": {
"version": "10.4.15", "version": "10.4.16",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
"integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==", "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"browserslist": "^4.21.10", "browserslist": "^4.21.10",
"caniuse-lite": "^1.0.30001520", "caniuse-lite": "^1.0.30001538",
"fraction.js": "^4.2.0", "fraction.js": "^4.3.6",
"normalize-range": "^0.1.2", "normalize-range": "^0.1.2",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"postcss-value-parser": "^4.2.0" "postcss-value-parser": "^4.2.0"
@@ -13890,9 +13890,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001534", "version": "1.0.30001547",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz",
"integrity": "sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==", "integrity": "sha512-W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA==",
"dev": true "dev": true
}, },
"chainsaw": { "chainsaw": {
@@ -17593,9 +17593,9 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.4.30", "version": "8.4.31",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
"integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"nanoid": "^3.3.6", "nanoid": "^3.3.6",

View File

@@ -111,7 +111,7 @@
"@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-node-resolve": "^15.2.1", "@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-replace": "^5.0.2", "@rollup/plugin-replace": "^5.0.2",
"autoprefixer": "^10.4.15", "autoprefixer": "^10.4.16",
"bundlewatch": "^0.3.3", "bundlewatch": "^0.3.3",
"clean-css-cli": "^5.6.2", "clean-css-cli": "^5.6.2",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
@@ -140,7 +140,7 @@
"lockfile-lint": "^4.12.1", "lockfile-lint": "^4.12.1",
"nodemon": "^3.0.1", "nodemon": "^3.0.1",
"npm-run-all2": "^6.0.6", "npm-run-all2": "^6.0.6",
"postcss": "^8.4.30", "postcss": "^8.4.31",
"postcss-cli": "^10.1.0", "postcss-cli": "^10.1.0",
"rollup": "^3.29.3", "rollup": "^3.29.3",
"rollup-plugin-istanbul": "^4.0.0", "rollup-plugin-istanbul": "^4.0.0",

View File

@@ -249,7 +249,7 @@ const popover = new bootstrap.Popover(element, {
const popover = bootstrap.Popover.getOrCreateInstance('#example') // Returns a Bootstrap popover instance const popover = bootstrap.Popover.getOrCreateInstance('#example') // Returns a Bootstrap popover instance
// setContent example // setContent example
myPopover.setContent({ popover.setContent({
'.popover-header': 'another title', '.popover-header': 'another title',
'.popover-body': 'another content' '.popover-body': 'another content'
}) })

View File

@@ -22,7 +22,7 @@ Background utilities like `.bg-*` that generated from our original `$theme-color
{{< colors.inline >}} {{< colors.inline >}}
{{- range (index $.Site.Data "theme-colors") }} {{- range (index $.Site.Data "theme-colors") }}
<div class="p-3 mb-2 bg-{{ .name }}{{ if .contrast_color }} text-{{ .contrast_color }}{{ else }} text-white{{ end }}">.bg-{{ .name }}</div> <div class="p-3 mb-2 bg-{{ .name }}{{ if .contrast_color }} text-{{ .contrast_color }}{{ else }} text-white{{ end }}">.bg-{{ .name }}</div>
<div class="p-3 mb-2 bg-{{ .name }}-subtle text-emphasis-{{ .name }}">.bg-{{ .name }}-subtle</div> <div class="p-3 mb-2 bg-{{ .name }}-subtle text-{{ .name }}-emphasis">.bg-{{ .name }}-subtle</div>
{{- end -}} {{- end -}}
{{< /colors.inline >}} {{< /colors.inline >}}
<p class="p-3 mb-2 bg-body-secondary">.bg-body-secondary</p> <p class="p-3 mb-2 bg-body-secondary">.bg-body-secondary</p>