Skip to content

Commit 78cb7bd

Browse files
chore(merge main): patched commit → 0cbfe13 (#2828)
1 parent 1751ffc commit 78cb7bd

17 files changed

+449
-455
lines changed

.cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"dropup",
4949
"dgst",
5050
"errorf",
51+
"español",
5152
"evenodd",
5253
"extranet",
5354
"favicon",
@@ -167,4 +168,4 @@
167168
"CHANGELOG.md"
168169
],
169170
"useGitignore": true
170-
}
171+
}

package-lock.json

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

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,16 @@
104104
"@popperjs/core": "^2.11.8"
105105
},
106106
"devDependencies": {
107-
"@babel/cli": "^7.25.9",
107+
"@babel/cli": "^7.26.4",
108108
"@babel/core": "^7.26.0",
109109
"@babel/preset-env": "^7.26.0",
110-
"@docsearch/js": "^3.7.0",
110+
"@docsearch/js": "^3.8.2",
111111
"@percy/cli": "^1.30.5",
112112
"@popperjs/core": "^2.11.8",
113113
"@rollup/plugin-babel": "^6.0.4",
114-
"@rollup/plugin-commonjs": "^28.0.1",
115-
"@rollup/plugin-node-resolve": "^15.3.0",
116-
"@rollup/plugin-replace": "^6.0.1",
114+
"@rollup/plugin-commonjs": "^28.0.2",
115+
"@rollup/plugin-node-resolve": "^16.0.0",
116+
"@rollup/plugin-replace": "^6.0.2",
117117
"@stackblitz/sdk": "^1.11.0",
118118
"@storybook/addon-a11y": "^8.4.7",
119119
"@storybook/addon-essentials": "^8.4.7",
@@ -138,9 +138,9 @@
138138
"focus-visible": "^5.2.1",
139139
"globby": "^14.0.2",
140140
"hammer-simulator": "0.0.1",
141-
"hugo-bin": "^0.134.1",
141+
"hugo-bin": "^0.137.0",
142142
"ip": "^2.0.0",
143-
"jasmine": "^5.3.0",
143+
"jasmine": "^5.5.0",
144144
"jquery": "^3.7.1",
145145
"karma": "^6.4.4",
146146
"karma-browserstack-launcher": "1.4.0",
@@ -152,25 +152,25 @@
152152
"karma-jasmine-html-reporter": "^2.1.0",
153153
"karma-rollup-preprocessor": "7.0.7",
154154
"lockfile-lint": "^4.14.0",
155-
"nodemon": "^3.1.7",
156-
"npm-run-all2": "^7.0.1",
155+
"nodemon": "^3.1.9",
156+
"npm-run-all2": "^7.0.2",
157157
"ods-storybook-theme": "^1.1.0",
158158
"pa11y-ci": "^3.1.0",
159159
"pa11y-ci-reporter-html": "^7.0.0",
160-
"postcss": "^8.4.47",
160+
"postcss": "^8.4.49",
161161
"postcss-cli": "^11.0.0",
162-
"rollup": "^4.24.4",
162+
"rollup": "^4.28.1",
163163
"rollup-plugin-istanbul": "^5.0.0",
164164
"rtlcss": "^4.3.0",
165165
"sass": "1.78.0",
166166
"sass-true": "^8.1.0",
167167
"shelljs": "^0.8.5",
168168
"sirv-cli": "^3.0.0",
169169
"storybook": "^8.4.7",
170-
"stylelint": "^16.10.0",
170+
"stylelint": "^16.12.0",
171171
"stylelint-config-twbs-bootstrap": "^15.1.0",
172172
"tarteaucitronjs": "^1.19.0",
173-
"terser": "^5.36.0",
173+
"terser": "^5.37.0",
174174
"vnu-jar": "24.10.17"
175175
},
176176
"files": [

scss/_button-group.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
// Prevent double borders when buttons are next to each other
4747
> :not(.btn-check:first-child) + .btn:not(.btn-toggle),
4848
> .btn-group:not(:first-child) {
49-
margin-left: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
49+
margin-left: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
5050
}
5151
// End mod
5252

@@ -119,9 +119,9 @@
119119

120120
&::before {
121121
position: absolute;
122-
top: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
123-
bottom: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
124-
left: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
122+
top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
123+
bottom: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
124+
left: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
125125
width: $btn-border-width;
126126
color: inherit;
127127
content: "";
@@ -201,7 +201,7 @@
201201

202202
> .btn:not(:first-child),
203203
> .btn-group:not(:first-child) {
204-
margin-top: calc(#{$btn-border-width} * -1); // stylelint-disable-line function-disallowed-list
204+
margin-top: calc(-1 * #{$btn-border-width}); // stylelint-disable-line function-disallowed-list
205205
}
206206

207207
// Reset rounded corners

scss/_carousel.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
color: $carousel-control-color;
101101
text-align: center;
102102
background: none;
103+
// Boosted mod: no filter
103104
border: 0;
104105
outline: 0; // Boosted mod
105106
box-shadow: none; // Boosted mod
@@ -202,7 +203,7 @@
202203
margin-left: $carousel-indicator-spacer;
203204
text-indent: -999px;
204205
cursor: pointer;
205-
background-color: $carousel-control-color; // Boosted mod
206+
background-color: $carousel-control-color; // Boosted mod: instead of `var(--#{$prefix}carousel-indicator-active-bg)`
206207
border: 0;
207208
// Boosted mod: use our own target-size() mixin instead of transparent borders
208209
opacity: $carousel-indicator-opacity;
@@ -354,7 +355,7 @@
354355
bottom: $carousel-caption-spacer;
355356
left: (100% - $carousel-caption-width) * .5;
356357
padding: $carousel-caption-padding-y $carousel-caption-padding-x; // Boosted mod
357-
color: $carousel-caption-color;
358+
color: $carousel-caption-color; // Boosted mod: instead of `var(--#{$prefix}carousel-caption-color)`
358359
background-color: $carousel-caption-bg; // Boosted mod
359360
}
360361

scss/_modal.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
@include border-top-radius(var(--#{$prefix}modal-inner-border-radius));
166166

167167
.btn-close {
168-
margin: calc(#{$btn-close-padding} * -1) calc(#{$btn-close-padding} * -1) calc(#{$btn-close-padding} * -1) auto; // Boosted mod: using custom properties for padding
168+
margin: calc(-1 * #{$btn-close-padding}) calc(-1 * #{$btn-close-padding}) calc(-1 * #{$btn-close-padding}) auto; // Boosted mod: using custom properties for padding
169169
}
170170
}
171171

scss/_pagination.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
margin-left: $pagination-margin-start;
106106
}
107107

108-
@if $pagination-margin-start == calc(#{$pagination-border-width} * -1) {
108+
@if $pagination-margin-start == calc(-1 * #{$pagination-border-width}) {
109109
&:first-child {
110110
.page-link {
111111
@include border-start-radius(var(--#{$prefix}pagination-border-radius));

scss/_variables-dark.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,14 @@ $form-switch-unchecked-invalid-border-color-dark: $form-invalid-border-color-dar
141141
// Boosted mod: no $accordion-button-icon-dark
142142
// Boosted mod: no $accordion-button-active-icon-dark
143143

144+
//
145+
// Carousel
146+
//
147+
148+
// Boosted mod: no $carousel-indicator-active-bg-dark
149+
// Boosted mod: no $carousel-caption-color-dark
150+
// Boosted mod: no $carousel-control-icon-filter-dark
151+
144152
//
145153
// Breadcrumb
146154
//

scss/_variables.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ $pagination-bg: transparent !default; // Boosted mod: instea
16581658
$pagination-border-radius: var(--#{$prefix}border-radius) !default;
16591659
$pagination-border-width: var(--#{$prefix}border-width) !default;
16601660
$pagination-margin-y: $spacer !default; // Boosted mod
1661-
$pagination-margin-start: 0 !default; // Boosted mod: instead of `calc($pagination-border-width * -1)`
1661+
$pagination-margin-start: 0 !default; // Boosted mod: instead of `calc(-1 * $pagination-border-width)`
16621662
$pagination-margin-x-first-last: $spacer * .5 !default; // Boosted mod
16631663
$pagination-border-color: transparent !default; // Boosted mod: instead of `var(--#{$prefix}border-color)`
16641664

@@ -2132,6 +2132,7 @@ $carousel-control-width: $spacer * 3 !default;
21322132
$carousel-control-opacity: null !default;
21332133
$carousel-control-hover-opacity: null !default;
21342134
$carousel-control-transition: $transition-focus !default;
2135+
// Boosted mod: no $carousel-control-icon-filter
21352136

21362137
$carousel-indicator-width: .5rem !default;
21372138
$carousel-indicator-height: .5rem !default;
@@ -2176,7 +2177,7 @@ $carousel-transition-duration: .6s !default;
21762177
$carousel-transition: transform $carousel-transition-duration $transition-timing !default; // Define transform transition first if using multiple transitions (e.g., `transform 2s ease, opacity .5s ease-out`)
21772178
// scss-docs-end carousel-variables
21782179

2179-
// Boosted mod: no dark carousel
2180+
// Boosted mod: no dark carousel variables
21802181

21812182

21822183
// Spinners

scss/forms/_input-group.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
}
124124

125125
> :not(:first-child):not(.dropdown-menu)#{$validation-messages} {
126-
margin-left: calc(#{$input-border-width} * -1); // stylelint-disable-line function-disallowed-list
126+
margin-left: calc(-1 * #{$input-border-width}); // stylelint-disable-line function-disallowed-list
127127
@include border-start-radius(0);
128128
}
129129

site/assets/scss/_tarteaucitron.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
@include tac("ClosePanel") {
6161
position: absolute;
6262
right: $modal-content-padding;
63-
margin: ($spacer / -2) calc(#{$btn-close-padding} * -1) calc(#{$btn-close-padding} * -1) auto; // stylelint-disable-line function-disallowed-list
63+
margin: ($spacer / -2) calc(-1 * #{$btn-close-padding}) calc(-1 * #{$btn-close-padding}) auto; // stylelint-disable-line function-disallowed-list
6464
overflow: hidden;
6565
text-indent: 2ch;
6666
white-space: nowrap;

site/content/docs/5.3/getting-started/parcel.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ thumbnail: guides/parcel-dev-server-boosted.png
2323
You may need to tweak a bit `src/scss/style.scss` and add a `src/fonts` directory to import font family properly in your project. Please refer to the font sub-section of [how to import Boosted](#import-boosted) for more details.
2424
{{< /callout >}}
2525

26+
## What is Parcel?
27+
[Parcel](https://parceljs.org/) is a web application bundler designed to simplify the development process with a zero-configuration setup out of the box. It offers features found in more advanced bundlers while focusing on ease of use, making it ideal for developers seeking a quick start.
28+
2629
## Setup
2730

2831
We're building a Parcel project with Boosted from scratch, so there are some prerequisites and upfront steps before we can really get started. This guide requires you to have Node.js installed and some familiarity with the terminal.

site/content/docs/5.3/getting-started/rtl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Do you want to automate this process and address several edge cases involving bo
205205

206206
1. It is recommended that you add the `dir` attribute to the `html` element. This way, the entire page will be affected when you change the direction. Also, make sure you add the `lang` attribute accordingly.
207207
2. Having a single bundle with both directions will increase the size of the final stylesheet (on average, by 20%-30%): consider some [optimization]({{< docsref "/customize/optimize" >}}).
208-
3. Take into account that PostCSS RTLCSS is not compatible with `/* rtl:remove */` directives because it doesn't remove any CSS rule. You should replace your `/* rtl:remove */`, `/* rtl:begin:remove */` and `/* rtl:end:remove */` directives with `/* rtl:ignore */`, `/* rtl:begin:ignore */` and `/* rtl:end:ignore */` directives respectively. These directives will ignore the rule and will not create an RTL counterpart (same result as the `remove` ones in RTLCSS).
208+
3. Take into account that PostCSS RTLCSS is not compatible with `/* rtl:remove */` directives because it doesn't remove any CSS rule. You should replace your `/* rtl:remove */`, `/* rtl:begin:remove */` and `/* rtl:end:remove */` directives with `/* rtl:freeze */`, `/* rtl:begin:freeze */` and `/* rtl:end:freeze */` directives respectively. These directives will prefix the targeted rules or declarations with the current direction but will not create an RTL counterpart (same result as the `remove` ones in RTLCSS).
209209
{{< /callout >}}
210210

211211
## The breadcrumb case

site/content/docs/5.3/getting-started/vite.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ thumbnail: guides/vite-dev-server-boosted.png
2323
You may need to tweak a bit `src/scss/style.scss` and add a `src/fonts` directory to import font family properly in your project. Please refer to the font sub-section of [how to import Boosted](#import-boosted) for more details.
2424
{{< /callout >}}
2525

26+
## What is Vite?
27+
[Vite](https://vite.dev/) is a modern frontend build tool designed for speed and simplicity. It provides an efficient and streamlined development experience, especially for modern JavaScript frameworks.
28+
2629
## Setup
2730

2831
We're building a Vite project with Boosted from scratch, so there are some prerequisites and upfront steps before we can really get started. This guide requires you to have Node.js installed and some familiarity with the terminal.

site/content/docs/5.3/getting-started/webpack.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ thumbnail: guides/webpack-dev-server-boosted.png
2323
You may need to tweak a bit `src/scss/style.scss` and add a `src/fonts` directory to import font family properly in your project. Please refer to the font sub-section of [how to import Boosted](#import-boosted) for more details.
2424
{{< /callout >}}
2525

26+
## What is Webpack?
27+
[Webpack](https://webpack.js.org/) is a JavaScript module bundler that processes modules and their dependencies to generate static assets. It simplifies managing complex web applications with multiple files and dependencies.
28+
2629
## Setup
2730

2831
We're building a Webpack project with Boosted from scratch, so there are some prerequisites and upfront steps before we can really get started. This guide requires you to have Node.js installed and some familiarity with the terminal.

site/content/docs/5.3/layout/css-grid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Similar to our default grid system, our CSS Grid allows for easy nesting of `.gr
151151
In practice this allows for more complex and custom layouts when compared to our default grid system.
152152

153153
{{< example class="bd-example-cssgrid" >}}
154-
<div class="grid text-center" style="--bs-columns: 3;">
154+
<div class="grid text-center overflow-x-auto" style="--bs-columns: 3;">
155155
<div>
156156
First auto-column
157157
<div class="grid">

site/layouts/partials/examples/main.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="{{ $entry.category | urlize }}">{{ $entry.category }}</h2>
2525
{{- $len := len $entry.examples -}}
2626
{{ if (eq $i 0) }}<div class="row">{{ end }}
2727
{{ if $entry.external -}}
28-
<div class="col-md-6 col-lg-4 mb-3 d-flex gap-3">
28+
<article class="col-md-6 col-lg-4 mb-3 d-flex gap-3">
2929
<svg class="bi fs-5 flex-shrink-0" aria-hidden="true"><use xlink:href="#box-seam"></use></svg>
3030
<div>
3131
<h3 class="h5 mb-1">
@@ -43,9 +43,9 @@ <h3 class="h5 mb-1">
4343
</a>
4444
</p>
4545
</div>
46-
</div>
46+
</article>
4747
{{ else -}}
48-
<div class="col-sm-6 col-md-3 mb-3">
48+
<article class="col-sm-6 col-md-3 mb-3">
4949
{{- $exampleNameUrlized := $example.name | urlize -}}
5050
{{- $exampleUrl := urls.JoinPath "/docs" $.Site.Params.docs_version "/examples" $exampleNameUrlized "/" }}
5151
<a class="d-block link-offset-1" href="{{ $exampleUrl }}"{{ if in $example.name "RTL" }} hreflang="ar"{{ end }}>
@@ -66,7 +66,7 @@ <h3 class="h5 mb-1">
6666
</h3>
6767
</a>
6868
<p class="text-body-secondary">{{ $example.description }}</p>
69-
</div>
69+
</article>
7070
{{- end }}
7171
{{ if (eq (add $i 1) $len) }}</div>{{ end -}}
7272
{{ end -}}

0 commit comments

Comments
 (0)