Skip to content

Commit

Permalink
Bump bootstrap from 5.1.3 to 5.2.0 (#729)
Browse files Browse the repository at this point in the history
* Bump bootstrap from 5.1.3 to 5.2.0-beta1

* Bump bootstrap from 5.2.0-beta1 to 5.2.0

---------

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
  • Loading branch information
tnir and deivid-rodriguez authored Dec 27, 2024
1 parent 30cf6ca commit 17dcfbc
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 16 deletions.
1 change: 1 addition & 0 deletions assets/javascripts/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ document.addEventListener('DOMContentLoaded', function () {
this.showPopover = function (text) {
this.popoverContent = this.generatePopoverContent(text);
const popover = Popover.getInstance(this.searchInput);
popover._disposePopper();
popover.show();
document.querySelector('.popover-body').innerHTML = this.popoverContent;
};
Expand Down
7 changes: 4 additions & 3 deletions assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $navbar-height: 50px;

// Boostrap 5 customization
// Document: https://getbootstrap.com/docs/5.2/customize/sass/#importing
// List of SCSS to load: https://github.com/twbs/bootstrap/blob/v5.1.3/scss/bootstrap.scss
// List of SCSS to load: https://github.com/twbs/bootstrap/blob/v5.2.0/scss/bootstrap.scss
@import "~bootstrap/scss/functions";

pre {
Expand All @@ -28,14 +28,15 @@ $pre-color: #fff;
$icon-font-path: '~bootstrap/assets/fonts/bootstrap/';

@import "~bootstrap/scss/variables";
@import "~bootstrap/scss/maps";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/utilities";

// Layout & components
// Note: tables, dropdown, button-group, accordion, breadcrumb, pagination,
// badge, alert, progress, list-group, close, toasts, modal, tooltip, carousel,
// spinners, offcanvas, and placeholders were excluded as they are not used as
// of Bootstrap 5.1.3
// of Bootstrap 5.2.0
@import "~bootstrap/scss/root";
@import "~bootstrap/scss/reboot";
@import "~bootstrap/scss/type";
Expand Down Expand Up @@ -69,7 +70,7 @@ $icon-font-path: '~bootstrap/assets/fonts/bootstrap/';
@import "anchorjs";
@import "search";

// More various utilities extended from Bootstrap 5.1
// More various utilities extended from Bootstrap 5.2
@import "opacity";

.row:after {
Expand Down
31 changes: 19 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"dependencies": {
"@popperjs/core": "^2.11.8",
"anchor-js": "^5.0.0",
"bootstrap": "^5.1.3",
"bootstrap": "^5.2.0",
"lunr": "^0.7.0"
}
}

0 comments on commit 17dcfbc

Please sign in to comment.