diff --git a/assets/javascripts/search.js b/assets/javascripts/search.js index 2f77b90dfd..e3fda2cc4c 100644 --- a/assets/javascripts/search.js +++ b/assets/javascripts/search.js @@ -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; }; diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss index 6d1b7e5432..94b03fbec9 100644 --- a/assets/stylesheets/application.css.scss +++ b/assets/stylesheets/application.css.scss @@ -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.2.0-beta1/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 { @@ -36,7 +36,7 @@ $icon-font-path: '~bootstrap/assets/fonts/bootstrap/'; // 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.2.0-beta1 +// of Bootstrap 5.2.0 @import "~bootstrap/scss/root"; @import "~bootstrap/scss/reboot"; @import "~bootstrap/scss/type"; diff --git a/package-lock.json b/package-lock.json index d56899074e..1675dfb6a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "anchor-js": "^5.0.0", - "bootstrap": "^5.2.0-beta1", + "bootstrap": "^5.2.0", "lunr": "^0.7.0" }, "devDependencies": { @@ -699,9 +699,9 @@ "integrity": "sha512-2bOqCsBIXAYhjAN3iI4QevoAJtB2gRWAiY9P3P7CVW8lIjA3Dl6ldhDlWeeQvCHif+V5vIndfLOag/5I8tzTzA==" }, "node_modules/bootstrap": { - "version": "5.2.0-beta1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0-beta1.tgz", - "integrity": "sha512-6qbgs177WZEFY4SLQUq3tEHayYG80nfDmyTpdKi0MJqRMdS+HAoq24+YKfx6wf+nHY0rx8zrh477J1lFu4WzOA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz", + "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==", "funding": [ { "type": "github", @@ -2695,9 +2695,9 @@ "integrity": "sha512-2bOqCsBIXAYhjAN3iI4QevoAJtB2gRWAiY9P3P7CVW8lIjA3Dl6ldhDlWeeQvCHif+V5vIndfLOag/5I8tzTzA==" }, "bootstrap": { - "version": "5.2.0-beta1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0-beta1.tgz", - "integrity": "sha512-6qbgs177WZEFY4SLQUq3tEHayYG80nfDmyTpdKi0MJqRMdS+HAoq24+YKfx6wf+nHY0rx8zrh477J1lFu4WzOA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz", + "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==", "requires": {} }, "braces": { diff --git a/package.json b/package.json index 1f1d5b7d55..52f4371738 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "anchor-js": "^5.0.0", - "bootstrap": "^5.2.0-beta1", + "bootstrap": "^5.2.0", "lunr": "^0.7.0" } }