Skip to content

Commit a59c8ee

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #879 from twbs/main
Create a new pull request by comparing changes across two branches
2 parents 1035a86 + 2f7184e commit a59c8ee

File tree

19 files changed

+476
-328
lines changed

19 files changed

+476
-328
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ updates:
2121
timezone: Europe/Athens
2222
versioning-strategy: increase
2323
rebase-strategy: disabled
24+
groups:
25+
production-dependencies:
26+
dependency-type: "production"
27+
development-dependencies:
28+
dependency-type: "development"

‎package-lock.json‎

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

‎package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"docs-serve": "hugo server --port 9001 --disableFastRender --noHTTPCache --renderToMemory --printPathWarnings --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 eslint,karma-browserstack-launcher,karma-rollup-preprocessor",
85+
"update-deps": "ncu -u -x eslint,eslint-config-xo,karma-browserstack-launcher,karma-rollup-preprocessor,sass",
8686
"release": "npm-run-all dist release-sri docs-build release-zip*",
8787
"release-sri": "node build/generate-sri.mjs",
8888
"release-version": "node build/change-version.mjs",
@@ -106,30 +106,30 @@
106106
"@babel/cli": "^7.25.6",
107107
"@babel/core": "^7.25.2",
108108
"@babel/preset-env": "^7.25.4",
109-
"@docsearch/js": "^3.6.1",
109+
"@docsearch/js": "^3.6.2",
110110
"@popperjs/core": "^2.11.8",
111111
"@rollup/plugin-babel": "^6.0.4",
112-
"@rollup/plugin-commonjs": "^26.0.1",
113-
"@rollup/plugin-node-resolve": "^15.2.3",
114-
"@rollup/plugin-replace": "^5.0.7",
112+
"@rollup/plugin-commonjs": "^28.0.0",
113+
"@rollup/plugin-node-resolve": "^15.3.0",
114+
"@rollup/plugin-replace": "^6.0.1",
115115
"@stackblitz/sdk": "^1.11.0",
116116
"autoprefixer": "^10.4.20",
117117
"bundlewatch": "^0.4.0",
118118
"clean-css-cli": "^5.6.3",
119119
"clipboard": "^2.0.11",
120120
"cross-env": "^7.0.3",
121-
"eslint": "^8.57.0",
121+
"eslint": "^8.57.1",
122122
"eslint-config-xo": "^0.45.0",
123-
"eslint-plugin-html": "^8.1.1",
123+
"eslint-plugin-html": "^8.1.2",
124124
"eslint-plugin-import": "^2.30.0",
125125
"eslint-plugin-markdown": "^5.1.0",
126126
"eslint-plugin-unicorn": "^55.0.0",
127127
"find-unused-sass-variables": "^6.0.0",
128128
"globby": "^14.0.2",
129129
"hammer-simulator": "0.0.1",
130-
"hugo-bin": "^0.130.1",
130+
"hugo-bin": "^0.132.0",
131131
"ip": "^2.0.1",
132-
"jasmine": "^5.2.0",
132+
"jasmine": "^5.3.0",
133133
"jquery": "^3.7.1",
134134
"karma": "^6.4.4",
135135
"karma-browserstack-launcher": "1.4.0",
@@ -141,19 +141,19 @@
141141
"karma-jasmine-html-reporter": "^2.1.0",
142142
"karma-rollup-preprocessor": "7.0.7",
143143
"lockfile-lint": "^4.14.0",
144-
"nodemon": "^3.1.4",
145-
"npm-run-all2": "^6.2.2",
146-
"postcss": "^8.4.45",
144+
"nodemon": "^3.1.7",
145+
"npm-run-all2": "^6.2.3",
146+
"postcss": "^8.4.47",
147147
"postcss-cli": "^11.0.0",
148-
"rollup": "^4.21.2",
148+
"rollup": "^4.23.0",
149149
"rollup-plugin-istanbul": "^5.0.0",
150150
"rtlcss": "^4.3.0",
151-
"sass": "^1.77.8",
151+
"sass": "1.78.0",
152152
"sass-true": "^8.0.0",
153153
"shelljs": "^0.8.5",
154-
"stylelint": "^16.8.1",
155-
"stylelint-config-twbs-bootstrap": "^15.0.0",
156-
"terser": "^5.31.6",
154+
"stylelint": "^16.9.0",
155+
"stylelint-config-twbs-bootstrap": "^15.1.0",
156+
"terser": "^5.34.1",
157157
"vnu-jar": "23.4.11"
158158
},
159159
"files": [

‎scss/_card.scss‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,7 @@
193193
// The child selector allows nested `.card` within `.card-group`
194194
// to display properly.
195195
> .card {
196-
// Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
197-
flex: 1 0 0%;
196+
flex: 1 0 0;
198197
margin-bottom: 0;
199198

200199
+ .card {

‎scss/_nav.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@
169169
.nav-justified {
170170
> .nav-link,
171171
.nav-item {
172-
flex-basis: 0;
173172
flex-grow: 1;
173+
flex-basis: 0;
174174
text-align: center;
175175
}
176176
}

‎scss/_navbar.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
// the default flexbox row orientation. Requires the use of `flex-wrap: wrap`
140140
// on the `.navbar` parent.
141141
.navbar-collapse {
142-
flex-basis: 100%;
143142
flex-grow: 1;
143+
flex-basis: 100%;
144144
// For always expanded or extra full navbars, ensure content aligns itself
145145
// properly vertically. Can be easily overridden with flex utilities.
146146
align-items: center;

‎scss/mixins/_grid.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
@include media-breakpoint-up($breakpoint, $breakpoints) {
7373
// Provide basic `.col-{bp}` classes for equal-width flexbox columns
7474
.col#{$infix} {
75-
flex: 1 0 0%; // Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
75+
flex: 1 0 0;
7676
}
7777

7878
.row-cols#{$infix}-auto > * {

‎site/content/docs/5.3/about/translations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Community members have translated Bootstrap's documentation into various languag
1010
{{< translations.inline >}}
1111
<ul>
1212
{{ range .Site.Data.translations -}}
13-
<li><a href="{{ .url }}" hreflang="{{ .code }}">{{ .description }} ({{ .name }})</a></li>
13+
<li><a href="{{ .url }}" hreflang="{{ .code }}" lang="{{ .code }}">{{ .description }} ({{ .name }})</a></li>
1414
{{ end -}}
1515
</ul>
1616
{{< /translations.inline >}}

‎site/content/docs/5.3/components/modal.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ When modals become too long for the user's viewport or device, they scroll indep
201201
<h1 class="modal-title fs-5" id="exampleModalLongTitle">Modal title</h1>
202202
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
203203
</div>
204-
<div class="modal-body" style="min-height: 1500px">
204+
<div class="modal-body" style="min-height: 100vh">
205205
<p>This is some placeholder content to show the scrolling behavior for modals. Instead of repeating the text in the modal, we use an inline style to set a minimum height, thereby extending the length of the overall modal and demonstrating the overflow scrolling. When content becomes longer than the height of the viewport, scrolling will move the modal as needed.</p>
206206
</div>
207207
<div class="modal-footer">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ And with custom HTML added:
111111
With an SVG:
112112

113113
<div class="bd-example tooltip-demo">
114-
<a href="#" class="d-inline-block" data-bs-toggle="tooltip" data-bs-title="Default tooltip">
114+
<a href="#" class="d-inline-block" data-bs-toggle="tooltip" data-bs-title="Default tooltip" aria-label="Hover or focus to see default tooltip">
115115
<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 100 100">
116116
<rect width="100%" height="100%" fill="#563d7c"/>
117117
<circle cx="50" cy="50" r="30" fill="#007bff"/>

0 commit comments

Comments
 (0)