Skip to content

Commit

Permalink
Update to v5.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Aug 13, 2023
1 parent cfee773 commit 07f432e
Show file tree
Hide file tree
Showing 44 changed files with 94 additions and 88 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Please see the appropriate guide for your environment of choice:
Add `bootstrap` to your Gemfile:

```ruby
gem 'bootstrap', '~> 5.3.0'
gem 'bootstrap', '~> 5.3.1'
```

Ensure that `sprockets-rails` is at least v2.3.2.
Expand Down
26 changes: 13 additions & 13 deletions assets/javascripts/bootstrap-sprockets.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
//= require ./bootstrap-global-this-define
//= require ./bootstrap/dom/manipulator
//= require ./bootstrap/dom/data
//= require ./bootstrap/util/index
//= require ./bootstrap/dom/event-handler
//= require ./bootstrap/dom/manipulator
//= require ./bootstrap/util/config
//= require ./bootstrap/base-component
//= require ./bootstrap/util/swipe
//= require ./bootstrap/dom/selector-engine
//= require ./bootstrap/util/component-functions
//= require ./bootstrap/toast
//= require ./bootstrap/button
//= require ./bootstrap/alert
//= require ./bootstrap/util/sanitizer
//= require ./bootstrap/util/template-factory
//= require ./bootstrap/util/swipe
//= require ./bootstrap/carousel
//= require ./bootstrap/tooltip
//= require ./bootstrap/util/focustrap
//= require ./bootstrap/button
//= require ./bootstrap/collapse
//= require ./bootstrap/util/backdrop
//= require ./bootstrap/dropdown
//= require ./bootstrap/util/component-functions
//= require ./bootstrap/alert
//= require ./bootstrap/util/focustrap
//= require ./bootstrap/util/scrollbar
//= require ./bootstrap/modal
//= require ./bootstrap/carousel
//= require ./bootstrap/scrollspy
//= require ./bootstrap/offcanvas
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover
//= require ./bootstrap/modal
//= require ./bootstrap/toast
//= require ./bootstrap/tab
//= require ./bootstrap/dropdown
//= require ./bootstrap/collapse
//= require ./bootstrap/scrollspy
//= require ./bootstrap-global-this-undefine
18 changes: 13 additions & 5 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v5.3.0 (https://getbootstrap.com/)
* Bootstrap v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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 @@ -667,7 +667,7 @@
* Constants
*/

const VERSION = '5.3.0';
const VERSION = '5.3.1';

/**
* Class definition
Expand Down Expand Up @@ -4038,6 +4038,8 @@
const ARROW_RIGHT_KEY = 'ArrowRight';
const ARROW_UP_KEY = 'ArrowUp';
const ARROW_DOWN_KEY = 'ArrowDown';
const HOME_KEY = 'Home';
const END_KEY = 'End';
const CLASS_NAME_ACTIVE = 'active';
const CLASS_NAME_FADE$1 = 'fade';
const CLASS_NAME_SHOW$1 = 'show';
Expand Down Expand Up @@ -4144,13 +4146,19 @@
this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE$1));
}
_keydown(event) {
if (![ARROW_LEFT_KEY, ARROW_RIGHT_KEY, ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key)) {
if (![ARROW_LEFT_KEY, ARROW_RIGHT_KEY, ARROW_UP_KEY, ARROW_DOWN_KEY, HOME_KEY, END_KEY].includes(event.key)) {
return;
}
event.stopPropagation(); // stopPropagation/preventDefault both added to support up/down keys without scrolling the page
event.preventDefault();
const isNext = [ARROW_RIGHT_KEY, ARROW_DOWN_KEY].includes(event.key);
const nextActiveElement = getNextActiveElement(this._getChildren().filter(element => !isDisabled(element)), event.target, isNext, true);
const children = this._getChildren().filter(element => !isDisabled(element));
let nextActiveElement;
if ([HOME_KEY, END_KEY].includes(event.key)) {
nextActiveElement = children[event.key === HOME_KEY ? 0 : children.length - 1];
} else {
const isNext = [ARROW_RIGHT_KEY, ARROW_DOWN_KEY].includes(event.key);
nextActiveElement = getNextActiveElement(children, event.target, isNext, true);
}
if (nextActiveElement) {
nextActiveElement.focus({
preventScroll: true
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.0 (https://getbootstrap.com/)
* Bootstrap alert.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
Expand Down
4 changes: 2 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.0 (https://getbootstrap.com/)
* Bootstrap base-component.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0';
const VERSION = '5.3.1';

/**
* Class definition
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.0 (https://getbootstrap.com/)
* Bootstrap button.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap carousel.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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/collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap collapse.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap collapse.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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/data.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap data.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap data.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap event-handler.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap manipulator.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap selector-engine.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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/dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap dropdown.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap dropdown.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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/modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap modal.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap modal.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap offcanvas.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap popover.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap scrollspy.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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: 12 additions & 4 deletions assets/javascripts/bootstrap/tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tab.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap tab.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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 @@ -35,6 +35,8 @@
const ARROW_RIGHT_KEY = 'ArrowRight';
const ARROW_UP_KEY = 'ArrowUp';
const ARROW_DOWN_KEY = 'ArrowDown';
const HOME_KEY = 'Home';
const END_KEY = 'End';
const CLASS_NAME_ACTIVE = 'active';
const CLASS_NAME_FADE = 'fade';
const CLASS_NAME_SHOW = 'show';
Expand Down Expand Up @@ -141,13 +143,19 @@
this._queueCallback(complete, element, element.classList.contains(CLASS_NAME_FADE));
}
_keydown(event) {
if (![ARROW_LEFT_KEY, ARROW_RIGHT_KEY, ARROW_UP_KEY, ARROW_DOWN_KEY].includes(event.key)) {
if (![ARROW_LEFT_KEY, ARROW_RIGHT_KEY, ARROW_UP_KEY, ARROW_DOWN_KEY, HOME_KEY, END_KEY].includes(event.key)) {
return;
}
event.stopPropagation(); // stopPropagation/preventDefault both added to support up/down keys without scrolling the page
event.preventDefault();
const isNext = [ARROW_RIGHT_KEY, ARROW_DOWN_KEY].includes(event.key);
const nextActiveElement = index_js.getNextActiveElement(this._getChildren().filter(element => !index_js.isDisabled(element)), event.target, isNext, true);
const children = this._getChildren().filter(element => !index_js.isDisabled(element));
let nextActiveElement;
if ([HOME_KEY, END_KEY].includes(event.key)) {
nextActiveElement = children[event.key === HOME_KEY ? 0 : children.length - 1];
} else {
const isNext = [ARROW_RIGHT_KEY, ARROW_DOWN_KEY].includes(event.key);
nextActiveElement = index_js.getNextActiveElement(children, event.target, isNext, true);
}
if (nextActiveElement) {
nextActiveElement.focus({
preventScroll: true
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/bootstrap/toast.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap toast.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap toast.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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/tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tooltip.js v5.3.0 (https://getbootstrap.com/)
* Bootstrap tooltip.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap backdrop.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap component-functions.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap config.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap focustrap.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap index.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap sanitizer.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap scrollbar.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap swipe.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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.0 (https://getbootstrap.com/)
* Bootstrap template-factory.js v5.3.1 (https://getbootstrap.com/)
* Copyright 2011-2023 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: 2 additions & 14 deletions assets/stylesheets/bootstrap/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
}

// Disabled state lightens text
&.disabled {
&.disabled,
&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
pointer-events: none;
cursor: default;
Expand Down Expand Up @@ -79,13 +80,6 @@
isolation: isolate;
border-color: var(--#{$prefix}nav-tabs-link-hover-border-color);
}

&.disabled,
&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
background-color: transparent;
border-color: transparent;
}
}

.nav-link.active,
Expand Down Expand Up @@ -117,12 +111,6 @@

.nav-link {
@include border-radius(var(--#{$prefix}nav-pills-border-radius));

&:disabled {
color: var(--#{$prefix}nav-link-disabled-color);
background-color: transparent;
border-color: transparent;
}
}

.nav-link.active,
Expand Down
8 changes: 4 additions & 4 deletions assets/stylesheets/bootstrap/_reboot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -524,15 +524,15 @@ legend {
height: auto;
}

// 1. Correct the outline style in Safari.
// 2. This overrides the extra rounded corners on search inputs in iOS so that our
// 1. This overrides the extra rounded corners on search inputs in iOS so that our
// `.form-control` class can properly style them. Note that this cannot simply
// be added to `.form-control` as it's not specific enough. For details, see
// https://github.com/twbs/bootstrap/issues/11586.
// 2. Correct the outline style in Safari.

[type="search"] {
outline-offset: -2px; // 1
-webkit-appearance: textfield; // 2
-webkit-appearance: textfield; // 1
outline-offset: -2px; // 2
}

// 1. A few input types should stay LTR
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/bootstrap/_variables-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $light-border-subtle-dark: $gray-700 !default;
$dark-border-subtle-dark: $gray-800 !default;
// scss-docs-end theme-border-subtle-dark-variables

$body-color-dark: $gray-500 !default;
$body-color-dark: $gray-300 !default;
$body-bg-dark: $gray-900 !default;
$body-secondary-color-dark: rgba($body-color-dark, .75) !default;
$body-secondary-bg-dark: $gray-800 !default;
Expand Down
Loading

0 comments on commit 07f432e

Please sign in to comment.