Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The changelog only includes changes specific to the RubyGem.
The Bootstrap framework changes can be found in [the Releases section of twbs/bootstrap](https://github.com/twbs/bootstrap/releases).
Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release of Bootstrap.

# 5.3.6

* Update to Bootstrap 5.3.6

# 5.3.4

* Autoprefixer is now optional.
Expand Down
24 changes: 12 additions & 12 deletions assets/javascripts/bootstrap-sprockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
//= require ./bootstrap/dom/manipulator
//= require ./bootstrap/util/config
//= require ./bootstrap/base-component
//= require ./bootstrap/button
//= require ./bootstrap/dom/selector-engine
//= require ./bootstrap/scrollspy
//= require ./bootstrap/util/scrollbar
//= require ./bootstrap/util/sanitizer
//= require ./bootstrap/util/swipe
//= require ./bootstrap/carousel
//= require ./bootstrap/collapse
//= require ./bootstrap/tab
//= require ./bootstrap/util/backdrop
//= require ./bootstrap/util/component-functions
//= require ./bootstrap/util/focustrap
//= require ./bootstrap/modal
//= require ./bootstrap/alert
//= require ./bootstrap/util/scrollbar
//= require ./bootstrap/offcanvas
//= require ./bootstrap/button
//= require ./bootstrap/dropdown
//= require ./bootstrap/collapse
//= require ./bootstrap/util/sanitizer
//= require ./bootstrap/util/template-factory
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover
//= require ./bootstrap/offcanvas
//= require ./bootstrap/alert
//= require ./bootstrap/util/swipe
//= require ./bootstrap/scrollspy
//= require ./bootstrap/carousel
//= require ./bootstrap/modal
//= require ./bootstrap/toast
//= require ./bootstrap/dropdown
//= require ./bootstrap/tab
//= require ./bootstrap-global-this-undefine
14 changes: 9 additions & 5 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v5.3.5 (https://getbootstrap.com/)
* Bootstrap v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down Expand Up @@ -666,7 +666,7 @@
* Constants
*/

const VERSION = '5.3.5';
const VERSION = '5.3.6';

/**
* Class definition
Expand All @@ -692,6 +692,8 @@
this[propertyName] = null;
}
}

// Private
_queueCallback(callback, element, isAnimated = true) {
executeAfterTransition(callback, element, isAnimated);
}
Expand Down Expand Up @@ -1623,11 +1625,11 @@
this._element.style[dimension] = '';
this._queueCallback(complete, this._element, true);
}

// Private
_isShown(element = this._element) {
return element.classList.contains(CLASS_NAME_SHOW$7);
}

// Private
_configAfterMerge(config) {
config.toggle = Boolean(config.toggle); // Coerce string values
config.parent = getElement(config.parent);
Expand Down Expand Up @@ -1870,6 +1872,9 @@
this._element.setAttribute('aria-expanded', 'false');
Manipulator.removeDataAttribute(this._menu, 'popper');
EventHandler.trigger(this._element, EVENT_HIDDEN$5, relatedTarget);

// Explicitly return focus to the trigger element
this._element.focus();
}
_getConfig(config) {
config = super._getConfig(config);
Expand Down Expand Up @@ -4391,7 +4396,6 @@
}

// Private

_maybeScheduleHide() {
if (!this._config.autohide) {
return;
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap alert.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap alert.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
6 changes: 4 additions & 2 deletions assets/javascripts/bootstrap/base-component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap base-component.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap base-component.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand All @@ -21,7 +21,7 @@
* Constants
*/

const VERSION = '5.3.5';
const VERSION = '5.3.6';

/**
* Class definition
Expand All @@ -47,6 +47,8 @@
this[propertyName] = null;
}
}

// Private
_queueCallback(callback, element, isAnimated = true) {
index_js.executeAfterTransition(callback, element, isAnimated);
}
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap button.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap button.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap carousel.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap carousel.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
6 changes: 3 additions & 3 deletions assets/javascripts/bootstrap/collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap collapse.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap collapse.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down Expand Up @@ -163,11 +163,11 @@
this._element.style[dimension] = '';
this._queueCallback(complete, this._element, true);
}

// Private
_isShown(element = this._element) {
return element.classList.contains(CLASS_NAME_SHOW);
}

// Private
_configAfterMerge(config) {
config.toggle = Boolean(config.toggle); // Coerce string values
config.parent = index_js.getElement(config.parent);
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/dom/data.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap data.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap data.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/dom/event-handler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap event-handler.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap event-handler.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/dom/manipulator.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap manipulator.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap manipulator.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/dom/selector-engine.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap selector-engine.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap selector-engine.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
5 changes: 4 additions & 1 deletion assets/javascripts/bootstrap/dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap dropdown.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap dropdown.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down Expand Up @@ -195,6 +195,9 @@
this._element.setAttribute('aria-expanded', 'false');
Manipulator.removeDataAttribute(this._menu, 'popper');
EventHandler.trigger(this._element, EVENT_HIDDEN, relatedTarget);

// Explicitly return focus to the trigger element
this._element.focus();
}
_getConfig(config) {
config = super._getConfig(config);
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap modal.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap modal.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/offcanvas.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap offcanvas.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap offcanvas.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap popover.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap popover.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap scrollspy.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap scrollspy.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tab.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap tab.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
3 changes: 1 addition & 2 deletions assets/javascripts/bootstrap/toast.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap toast.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap toast.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down Expand Up @@ -119,7 +119,6 @@
}

// Private

_maybeScheduleHide() {
if (!this._config.autohide) {
return;
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tooltip.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap tooltip.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/backdrop.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap backdrop.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap backdrop.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/component-functions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap component-functions.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap component-functions.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap config.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap config.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/focustrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap focustrap.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap focustrap.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap index.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap index.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/sanitizer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap sanitizer.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap sanitizer.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/scrollbar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap scrollbar.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap scrollbar.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/swipe.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap swipe.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap swipe.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/util/template-factory.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap template-factory.js v5.3.5 (https://getbootstrap.com/)
* Bootstrap template-factory.js v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
16 changes: 8 additions & 8 deletions assets/stylesheets/bootstrap/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,13 @@
&:not(:last-child) {
@include border-end-radius(0);

.card-img-top,
.card-header {
> .card-img-top,
> .card-header {
// stylelint-disable-next-line property-disallowed-list
border-top-right-radius: 0;
}
.card-img-bottom,
.card-footer {
> .card-img-bottom,
> .card-footer {
// stylelint-disable-next-line property-disallowed-list
border-bottom-right-radius: 0;
}
Expand All @@ -221,13 +221,13 @@
&:not(:first-child) {
@include border-start-radius(0);

.card-img-top,
.card-header {
> .card-img-top,
> .card-header {
// stylelint-disable-next-line property-disallowed-list
border-top-left-radius: 0;
}
.card-img-bottom,
.card-footer {
> .card-img-bottom,
> .card-footer {
// stylelint-disable-next-line property-disallowed-list
border-bottom-left-radius: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/mixins/_banner.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@mixin bsBanner($file) {
/*!
* Bootstrap #{$file} v5.3.5 (https://getbootstrap.com/)
* Bootstrap #{$file} v5.3.6 (https://getbootstrap.com/)
* Copyright 2011-2025 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
5 changes: 5 additions & 0 deletions assets/stylesheets/bootstrap/mixins/_visually-hidden.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
&:not(caption) {
position: absolute !important;
}

// Fix to prevent overflowing children to become focusable
* {
overflow: hidden !important;
}
}

// Use to only display content when it's focused, or one of its child elements is focused
Expand Down
Loading
Loading