Skip to content

Commit 1f6d705

Browse files
chore(merge main):patched commit → eed621d (#2941)
1 parent dfea16a commit 1f6d705

28 files changed

+692
-477
lines changed

.cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
"urlquery",
144144
"vbtn",
145145
"Versión",
146+
"viewbox",
146147
"viewports",
147148
"Vite",
148149
"vstack",

.github/SUPPORT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For general Boosted troubleshooting or help getting started:
1111

1212
For general Bootstrap troubleshooting or help getting started:
1313

14-
- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
14+
- Follow [@getbootstrap on X](https://x.com/getbootstrap).
1515
- Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/).
1616
- Ask questions and explore [Bootstrap GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
1717
- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://www.reddit.com/r/bootstrap/).

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ Our default branch is for development of our Boosted 5 release. Head to the [`v4
166166

167167
**Mark Otto**
168168

169-
- <https://twitter.com/mdo>
169+
- <https://x.com/mdo>
170170
- <https://github.com/mdo>
171171

172172
**Jacob Thornton**
173173

174-
- <https://twitter.com/fat>
174+
- <https://x.com/fat>
175175
- <https://github.com/fat>
176176

177177
## Thanks

hugo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ params:
7171
rfs_version: "v10.0.0"
7272
bootstrap_github_org: "https://github.com/twbs"
7373
repo: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap"
74-
twitter: "getbootstrap"
74+
x: "getbootstrap"
7575
blog: "https://blog.getbootstrap.com/"
7676
icons: "https://oran.ge/icons"
7777
icons_develop: "https://design.orange.com/0c1af118d/p/12bc75-develop"

js/tests/unit/popover.spec.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ describe('Popover', () => {
5858
describe('show', () => {
5959
it('should toggle a popover after show', () => {
6060
return new Promise(resolve => {
61-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
61+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
6262

6363
const popoverEl = fixtureEl.querySelector('a')
6464
const popover = new Popover(popoverEl)
@@ -78,7 +78,7 @@ describe('Popover', () => {
7878

7979
it('should show a popover', () => {
8080
return new Promise(resolve => {
81-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
81+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
8282

8383
const popoverEl = fixtureEl.querySelector('a')
8484
const popover = new Popover(popoverEl)
@@ -94,7 +94,7 @@ describe('Popover', () => {
9494

9595
it('should set title and content from functions', () => {
9696
return new Promise(resolve => {
97-
fixtureEl.innerHTML = '<a href="#">BS twitter</a>'
97+
fixtureEl.innerHTML = '<a href="#">BS X</a>'
9898

9999
const popoverEl = fixtureEl.querySelector('a')
100100
const popover = new Popover(popoverEl, {
@@ -117,7 +117,7 @@ describe('Popover', () => {
117117

118118
it('should call content and title functions with trigger element', () => {
119119
return new Promise(resolve => {
120-
fixtureEl.innerHTML = '<a href="#" data-foo="bar">BS twitter</a>'
120+
fixtureEl.innerHTML = '<a href="#" data-foo="bar">BS X</a>'
121121

122122
const popoverEl = fixtureEl.querySelector('a')
123123
const popover = new Popover(popoverEl, {
@@ -144,7 +144,7 @@ describe('Popover', () => {
144144

145145
it('should call content and title functions with correct this value', () => {
146146
return new Promise(resolve => {
147-
fixtureEl.innerHTML = '<a href="#" data-foo="bar">BS twitter</a>'
147+
fixtureEl.innerHTML = '<a href="#" data-foo="bar">BS X</a>'
148148

149149
const popoverEl = fixtureEl.querySelector('a')
150150
const popover = new Popover(popoverEl, {
@@ -247,7 +247,7 @@ describe('Popover', () => {
247247
})
248248

249249
it('"setContent" should keep the initial template', () => {
250-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap" data-bs-custom-class="custom-class">BS twitter</a>'
250+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap" data-bs-custom-class="custom-class">BS X</a>'
251251

252252
const popoverEl = fixtureEl.querySelector('a')
253253
const popover = new Popover(popoverEl)
@@ -264,7 +264,7 @@ describe('Popover', () => {
264264

265265
it('should call setContent once', () => {
266266
return new Promise(resolve => {
267-
fixtureEl.innerHTML = '<a href="#">BS twitter</a>'
267+
fixtureEl.innerHTML = '<a href="#">BS X</a>'
268268

269269
const popoverEl = fixtureEl.querySelector('a')
270270
const popover = new Popover(popoverEl, {
@@ -298,7 +298,7 @@ describe('Popover', () => {
298298

299299
it('should show a popover with provided custom class', () => {
300300
return new Promise(resolve => {
301-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap" data-bs-custom-class="custom-class">BS twitter</a>'
301+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap" data-bs-custom-class="custom-class">BS X</a>'
302302

303303
const popoverEl = fixtureEl.querySelector('a')
304304
const popover = new Popover(popoverEl)
@@ -318,7 +318,7 @@ describe('Popover', () => {
318318
describe('hide', () => {
319319
it('should hide a popover', () => {
320320
return new Promise(resolve => {
321-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
321+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
322322

323323
const popoverEl = fixtureEl.querySelector('a')
324324
const popover = new Popover(popoverEl)
@@ -339,7 +339,7 @@ describe('Popover', () => {
339339

340340
describe('jQueryInterface', () => {
341341
it('should create a popover', () => {
342-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
342+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
343343

344344
const popoverEl = fixtureEl.querySelector('a')
345345

@@ -352,7 +352,7 @@ describe('Popover', () => {
352352
})
353353

354354
it('should create a popover with a config object', () => {
355-
fixtureEl.innerHTML = '<a href="#" title="Popover">BS twitter</a>'
355+
fixtureEl.innerHTML = '<a href="#" title="Popover">BS X</a>'
356356

357357
const popoverEl = fixtureEl.querySelector('a')
358358

@@ -367,7 +367,7 @@ describe('Popover', () => {
367367
})
368368

369369
it('should not re create a popover', () => {
370-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
370+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
371371

372372
const popoverEl = fixtureEl.querySelector('a')
373373
const popover = new Popover(popoverEl)
@@ -381,7 +381,7 @@ describe('Popover', () => {
381381
})
382382

383383
it('should throw error on undefined method', () => {
384-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
384+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
385385

386386
const popoverEl = fixtureEl.querySelector('a')
387387
const action = 'undefinedMethod'
@@ -395,7 +395,7 @@ describe('Popover', () => {
395395
})
396396

397397
it('should should call show method', () => {
398-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
398+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
399399

400400
const popoverEl = fixtureEl.querySelector('a')
401401
const popover = new Popover(popoverEl)
@@ -413,7 +413,7 @@ describe('Popover', () => {
413413

414414
describe('getInstance', () => {
415415
it('should return popover instance', () => {
416-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
416+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
417417

418418
const popoverEl = fixtureEl.querySelector('a')
419419
const popover = new Popover(popoverEl)
@@ -423,7 +423,7 @@ describe('Popover', () => {
423423
})
424424

425425
it('should return null when there is no popover instance', () => {
426-
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://twitter.com/getbootstrap">BS twitter</a>'
426+
fixtureEl.innerHTML = '<a href="#" title="Popover" data-bs-content="https://x.com/getbootstrap">BS X</a>'
427427

428428
const popoverEl = fixtureEl.querySelector('a')
429429

js/tests/visual/tooltip.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="container">
2121
<h1>Tooltip <small>Boosted Visual Test</small></h1>
2222

23-
<p class="text-body-secondary">Tight pants next level keffiyeh <a href="#" data-bs-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-bs-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-bs-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-bs-toggle="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.</p>
23+
<p class="text-body-secondary">Tight pants next level keffiyeh <a href="#" data-bs-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-bs-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-bs-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-bs-toggle="tooltip" title="The last tip!">freegan cred</a> raw denim single-origin coffee viral.</p>
2424

2525
<hr>
2626

0 commit comments

Comments
 (0)