You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/05/06 09:51:49 UTC
[myfaces-tobago] branch master updated: build: Rebuild frontend
CSS/JS with Bootstrap 5.0.0
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new a740073 build: Rebuild frontend CSS/JS with Bootstrap 5.0.0
a740073 is described below
commit a74007372a230fbfa7e460ca4e317c5d299f3010
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu May 6 11:43:52 2021 +0200
build: Rebuild frontend CSS/JS with Bootstrap 5.0.0
---
tobago-theme/package-lock.json | 6 +-
tobago-theme/package.json | 2 +-
.../src/main/css/tobago.css | 75 +-
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 75 +-
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 75 +-
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-speyside/src/main/css/tobago.css | 75 +-
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-standard/src/main/css/tobago.css | 75 +-
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-standard/src/main/js/tobago.js | 966 +++++++++++----------
.../src/main/js/tobago.js.map | 2 +-
.../src/main/js/tobago.min.js | 6 +-
.../src/main/js/tobago.min.js.map | 2 +-
16 files changed, 701 insertions(+), 668 deletions(-)
diff --git a/tobago-theme/package-lock.json b/tobago-theme/package-lock.json
index d79d291..cb72d96 100644
--- a/tobago-theme/package-lock.json
+++ b/tobago-theme/package-lock.json
@@ -1542,9 +1542,9 @@
"dev": true
},
"bootstrap": {
- "version": "5.0.0-beta3",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0-beta3.tgz",
- "integrity": "sha512-0urccjfIOzhrb9qJysN8XW/DRw6rg3zH7qLeKIp4Zyl8+Ens4JWB0NC0cB5AhnSFPd2tftRggjwCMxablo6Tpg=="
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz",
+ "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA=="
},
"brace-expansion": {
"version": "1.1.11",
diff --git a/tobago-theme/package.json b/tobago-theme/package.json
index c1cb2fe..a4ee82e 100644
--- a/tobago-theme/package.json
+++ b/tobago-theme/package.json
@@ -63,7 +63,7 @@
},
"dependencies": {
"@trevoreyre/autocomplete-js": "^2.2.0",
- "bootstrap": "5.0.0-beta3",
+ "bootstrap": "5.0.0",
"vanillajs-datepicker": "^1.1.4"
},
"devDependencies": {
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
index 6c2516b..977031d 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -32,7 +32,7 @@
* limitations under the License.
*/
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2197,7 +2197,7 @@ progress {
.form-control[type=file] {
overflow: hidden;
}
-.form-control[type=file]:not(:disabled):not([readonly]) {
+.form-control[type=file]:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control:focus {
@@ -2214,7 +2214,7 @@ progress {
color: #777777;
opacity: 1;
}
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled, .form-control:read-only {
background-color: #323232;
opacity: 1;
}
@@ -2237,7 +2237,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
+.form-control:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: #c6c6c6;
}
.form-control::-webkit-file-upload-button {
@@ -2259,7 +2259,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
background-color: #c6c6c6;
}
@@ -2328,7 +2328,7 @@ textarea.form-control-lg {
height: auto;
padding: 0.375rem;
}
-.form-control-color:not(:disabled):not([readonly]) {
+.form-control-color:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control-color::-moz-color-swatch {
@@ -2751,6 +2751,8 @@ textarea.form-control-lg {
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #abf5ff;
+}
+.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23abf5ff' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
@@ -2833,6 +2835,8 @@ textarea.form-control-lg {
.was-validated .form-select:invalid, .form-select.is-invalid {
border-color: #ff00be;
+}
+.was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23ff00be'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx [...]
background-position: right 0.75rem center, center right 2.25rem;
@@ -3417,7 +3421,6 @@ textarea.form-control-lg {
.dropdown-menu {
position: absolute;
- top: 100%;
z-index: 1000;
display: none;
min-width: 10rem;
@@ -3433,6 +3436,7 @@ textarea.form-control-lg {
border-radius: 0.25rem;
}
.dropdown-menu[data-bs-popper] {
+ top: 100%;
left: 0;
margin-top: 0.125rem;
}
@@ -3558,12 +3562,10 @@ textarea.form-control-lg {
margin-left: 0;
}
-.dropend .dropdown-menu {
+.dropend .dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;
-}
-.dropend .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-left: 0.125rem;
}
@@ -3584,12 +3586,10 @@ textarea.form-control-lg {
vertical-align: 0;
}
-.dropstart .dropdown-menu {
+.dropstart .dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;
-}
-.dropstart .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-right: 0.125rem;
}
@@ -3808,6 +3808,7 @@ textarea.form-control-lg {
.nav-link {
display: block;
padding: 0.5rem 1rem;
+ color: #9b8f51;
text-decoration: none;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
}
@@ -3816,6 +3817,9 @@ textarea.form-control-lg {
transition: none;
}
}
+.nav-link:hover, .nav-link:focus {
+ color: #58512e;
+}
.nav-link.disabled {
color: #777777;
pointer-events: none;
@@ -4398,7 +4402,7 @@ textarea.form-control-lg {
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%234a8787'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- transform: rotate(180deg);
+ transform: rotate(-180deg);
}
.accordion-button::after {
flex-shrink: 0;
@@ -4431,7 +4435,6 @@ textarea.form-control-lg {
}
.accordion-item {
- margin-bottom: -1px;
background-color: #fffbe8;
border: 1px solid rgba(0, 0, 0, 0.125);
}
@@ -4443,8 +4446,10 @@ textarea.form-control-lg {
border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px);
}
+.accordion-item:not(:first-of-type) {
+ border-top: 0;
+}
.accordion-item:last-of-type {
- margin-bottom: 0;
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
@@ -5243,7 +5248,7 @@ textarea.form-control-lg {
position: fixed;
top: 0;
left: 0;
- z-index: 1050;
+ z-index: 1040;
width: 100vw;
height: 100vh;
background-color: #000000;
@@ -5296,14 +5301,6 @@ textarea.form-control-lg {
margin: 0.25rem;
}
-.modal-scrollbar-measure {
- position: absolute;
- top: -9999px;
- width: 50px;
- height: 50px;
- overflow: scroll;
-}
-
@media (min-width: 576px) {
.modal-dialog {
max-width: 500px;
@@ -5909,7 +5906,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
@@ -5935,7 +5932,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
background-color: currentColor;
border-radius: 50%;
opacity: 0;
@@ -5956,7 +5953,7 @@ textarea.form-control-lg {
.offcanvas {
position: fixed;
bottom: 0;
- z-index: 1040;
+ z-index: 1050;
display: flex;
flex-direction: column;
max-width: 100%;
@@ -5974,6 +5971,7 @@ textarea.form-control-lg {
.offcanvas-header {
display: flex;
+ align-items: center;
justify-content: space-between;
padding: 1rem 1rem;
}
@@ -6009,6 +6007,16 @@ textarea.form-control-lg {
transform: translateX(100%);
}
+.offcanvas-top {
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 30vh;
+ max-height: 100%;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ transform: translateY(-100%);
+}
+
.offcanvas-bottom {
right: 0;
left: 0;
@@ -6022,17 +6030,6 @@ textarea.form-control-lg {
transform: none;
}
-.offcanvas-backdrop::before {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1039;
- width: 100vw;
- height: 100vh;
- content: "";
- background-color: rgba(0, 0, 0, 0.5);
-}
-
.clearfix::after {
display: block;
clear: both;
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
index 1f63de0..0a8c6e5 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
index a6d88bc..5675f9b 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -59,7 +59,7 @@
}
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2224,7 +2224,7 @@ progress {
.form-control[type=file] {
overflow: hidden;
}
-.form-control[type=file]:not(:disabled):not([readonly]) {
+.form-control[type=file]:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control:focus {
@@ -2241,7 +2241,7 @@ progress {
color: #777777;
opacity: 1;
}
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled, .form-control:read-only {
background-color: #323232;
opacity: 1;
}
@@ -2264,7 +2264,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
+.form-control:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: #dde0e3;
}
.form-control::-webkit-file-upload-button {
@@ -2286,7 +2286,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
background-color: #dde0e3;
}
@@ -2355,7 +2355,7 @@ textarea.form-control-lg {
height: auto;
padding: 0.375rem;
}
-.form-control-color:not(:disabled):not([readonly]) {
+.form-control-color:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control-color::-moz-color-swatch {
@@ -2778,6 +2778,8 @@ textarea.form-control-lg {
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #1C690A;
+}
+.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%231C690A' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
@@ -2860,6 +2862,8 @@ textarea.form-control-lg {
.was-validated .form-select:invalid, .form-select.is-invalid {
border-color: #ffb243;
+}
+.was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23ffb243'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx [...]
background-position: right 0.75rem center, center right 2.25rem;
@@ -3444,7 +3448,6 @@ textarea.form-control-lg {
.dropdown-menu {
position: absolute;
- top: 100%;
z-index: 1000;
display: none;
min-width: 10rem;
@@ -3460,6 +3463,7 @@ textarea.form-control-lg {
border-radius: 0.25rem;
}
.dropdown-menu[data-bs-popper] {
+ top: 100%;
left: 0;
margin-top: 0.125rem;
}
@@ -3585,12 +3589,10 @@ textarea.form-control-lg {
margin-left: 0;
}
-.dropend .dropdown-menu {
+.dropend .dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;
-}
-.dropend .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-left: 0.125rem;
}
@@ -3611,12 +3613,10 @@ textarea.form-control-lg {
vertical-align: 0;
}
-.dropstart .dropdown-menu {
+.dropstart .dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;
-}
-.dropstart .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-right: 0.125rem;
}
@@ -3835,6 +3835,7 @@ textarea.form-control-lg {
.nav-link {
display: block;
padding: 0.5rem 1rem;
+ color: #9f32ff;
text-decoration: none;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
}
@@ -3843,6 +3844,9 @@ textarea.form-control-lg {
transition: none;
}
}
+.nav-link:hover, .nav-link:focus {
+ color: #dbb2ff;
+}
.nav-link.disabled {
color: #777777;
pointer-events: none;
@@ -4421,7 +4425,7 @@ textarea.form-control-lg {
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23c17500'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- transform: rotate(180deg);
+ transform: rotate(-180deg);
}
.accordion-button::after {
flex-shrink: 0;
@@ -4454,7 +4458,6 @@ textarea.form-control-lg {
}
.accordion-item {
- margin-bottom: -2px;
background-color: #000000;
border: 2px solid rgba(0, 0, 0, 0.125);
}
@@ -4466,8 +4469,10 @@ textarea.form-control-lg {
border-top-left-radius: calc(0.25rem - 2px);
border-top-right-radius: calc(0.25rem - 2px);
}
+.accordion-item:not(:first-of-type) {
+ border-top: 0;
+}
.accordion-item:last-of-type {
- margin-bottom: 0;
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
@@ -5266,7 +5271,7 @@ textarea.form-control-lg {
position: fixed;
top: 0;
left: 0;
- z-index: 1050;
+ z-index: 1040;
width: 100vw;
height: 100vh;
background-color: #000000;
@@ -5319,14 +5324,6 @@ textarea.form-control-lg {
margin: 0.25rem;
}
-.modal-scrollbar-measure {
- position: absolute;
- top: -9999px;
- width: 50px;
- height: 50px;
- overflow: scroll;
-}
-
@media (min-width: 576px) {
.modal-dialog {
max-width: 500px;
@@ -5932,7 +5929,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
@@ -5958,7 +5955,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
background-color: currentColor;
border-radius: 50%;
opacity: 0;
@@ -5979,7 +5976,7 @@ textarea.form-control-lg {
.offcanvas {
position: fixed;
bottom: 0;
- z-index: 1040;
+ z-index: 1050;
display: flex;
flex-direction: column;
max-width: 100%;
@@ -5997,6 +5994,7 @@ textarea.form-control-lg {
.offcanvas-header {
display: flex;
+ align-items: center;
justify-content: space-between;
padding: 1rem 1rem;
}
@@ -6032,6 +6030,16 @@ textarea.form-control-lg {
transform: translateX(100%);
}
+.offcanvas-top {
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 30vh;
+ max-height: 100%;
+ border-bottom: 2px solid rgba(0, 0, 0, 0.2);
+ transform: translateY(-100%);
+}
+
.offcanvas-bottom {
right: 0;
left: 0;
@@ -6045,17 +6053,6 @@ textarea.form-control-lg {
transform: none;
}
-.offcanvas-backdrop::before {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1039;
- width: 100vw;
- height: 100vh;
- content: "";
- background-color: rgba(0, 0, 0, 0.5);
-}
-
.clearfix::after {
display: block;
clear: both;
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
index 5d0c9de..2da1f53 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scs [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
index e3d9953..6279c03 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2181,7 +2181,7 @@ progress {
.form-control[type=file] {
overflow: hidden;
}
-.form-control[type=file]:not(:disabled):not([readonly]) {
+.form-control[type=file]:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control:focus {
@@ -2198,7 +2198,7 @@ progress {
color: #6c757d;
opacity: 1;
}
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled, .form-control:read-only {
background-color: #e9ecef;
opacity: 1;
}
@@ -2221,7 +2221,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
+.form-control:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: #dde0e3;
}
.form-control::-webkit-file-upload-button {
@@ -2243,7 +2243,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
background-color: #dde0e3;
}
@@ -2312,7 +2312,7 @@ textarea.form-control-lg {
height: auto;
padding: 0.375rem;
}
-.form-control-color:not(:disabled):not([readonly]) {
+.form-control-color:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control-color::-moz-color-swatch {
@@ -2735,6 +2735,8 @@ textarea.form-control-lg {
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #198754;
+}
+.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
@@ -2817,6 +2819,8 @@ textarea.form-control-lg {
.was-validated .form-select:invalid, .form-select.is-invalid {
border-color: #dc3545;
+}
+.was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23dc3545'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx [...]
background-position: right 0.75rem center, center right 2.25rem;
@@ -3401,7 +3405,6 @@ textarea.form-control-lg {
.dropdown-menu {
position: absolute;
- top: 100%;
z-index: 1000;
display: none;
min-width: 10rem;
@@ -3417,6 +3420,7 @@ textarea.form-control-lg {
border-radius: 0.25rem;
}
.dropdown-menu[data-bs-popper] {
+ top: 100%;
left: 0;
margin-top: 0.125rem;
}
@@ -3542,12 +3546,10 @@ textarea.form-control-lg {
margin-left: 0;
}
-.dropend .dropdown-menu {
+.dropend .dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;
-}
-.dropend .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-left: 0.125rem;
}
@@ -3568,12 +3570,10 @@ textarea.form-control-lg {
vertical-align: 0;
}
-.dropstart .dropdown-menu {
+.dropstart .dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;
-}
-.dropstart .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-right: 0.125rem;
}
@@ -3792,6 +3792,7 @@ textarea.form-control-lg {
.nav-link {
display: block;
padding: 0.5rem 1rem;
+ color: #0d6efd;
text-decoration: none;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
}
@@ -3800,6 +3801,9 @@ textarea.form-control-lg {
transition: none;
}
}
+.nav-link:hover, .nav-link:focus {
+ color: #0a58ca;
+}
.nav-link.disabled {
color: #6c757d;
pointer-events: none;
@@ -4378,7 +4382,7 @@ textarea.form-control-lg {
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- transform: rotate(180deg);
+ transform: rotate(-180deg);
}
.accordion-button::after {
flex-shrink: 0;
@@ -4411,7 +4415,6 @@ textarea.form-control-lg {
}
.accordion-item {
- margin-bottom: -1px;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.125);
}
@@ -4423,8 +4426,10 @@ textarea.form-control-lg {
border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px);
}
+.accordion-item:not(:first-of-type) {
+ border-top: 0;
+}
.accordion-item:last-of-type {
- margin-bottom: 0;
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
@@ -5223,7 +5228,7 @@ textarea.form-control-lg {
position: fixed;
top: 0;
left: 0;
- z-index: 1050;
+ z-index: 1040;
width: 100vw;
height: 100vh;
background-color: #000;
@@ -5276,14 +5281,6 @@ textarea.form-control-lg {
margin: 0.25rem;
}
-.modal-scrollbar-measure {
- position: absolute;
- top: -9999px;
- width: 50px;
- height: 50px;
- overflow: scroll;
-}
-
@media (min-width: 576px) {
.modal-dialog {
max-width: 500px;
@@ -5889,7 +5886,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
@@ -5915,7 +5912,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
background-color: currentColor;
border-radius: 50%;
opacity: 0;
@@ -5936,7 +5933,7 @@ textarea.form-control-lg {
.offcanvas {
position: fixed;
bottom: 0;
- z-index: 1040;
+ z-index: 1050;
display: flex;
flex-direction: column;
max-width: 100%;
@@ -5954,6 +5951,7 @@ textarea.form-control-lg {
.offcanvas-header {
display: flex;
+ align-items: center;
justify-content: space-between;
padding: 1rem 1rem;
}
@@ -5989,6 +5987,16 @@ textarea.form-control-lg {
transform: translateX(100%);
}
+.offcanvas-top {
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 30vh;
+ max-height: 100%;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ transform: translateY(-100%);
+}
+
.offcanvas-bottom {
right: 0;
left: 0;
@@ -6002,17 +6010,6 @@ textarea.form-control-lg {
transform: none;
}
-.offcanvas-backdrop::before {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1039;
- width: 100vw;
- height: 100vh;
- content: "";
- background-color: rgba(0, 0, 0, 0.5);
-}
-
.clearfix::after {
display: block;
clear: both;
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
index af17036..d0425f5 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
index 197c75e..6a19a46 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -32,7 +32,7 @@
* limitations under the License.
*/
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2194,7 +2194,7 @@ progress {
.form-control[type=file] {
overflow: hidden;
}
-.form-control[type=file]:not(:disabled):not([readonly]) {
+.form-control[type=file]:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control:focus {
@@ -2211,7 +2211,7 @@ progress {
color: #999;
opacity: 1;
}
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled, .form-control:read-only {
background-color: #f7f7f7;
opacity: 1;
}
@@ -2234,7 +2234,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
+.form-control:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: #d8d9da;
}
.form-control::-webkit-file-upload-button {
@@ -2256,7 +2256,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
background-color: #d8d9da;
}
@@ -2323,7 +2323,7 @@ textarea.form-control-lg {
height: auto;
padding: 0.375rem;
}
-.form-control-color:not(:disabled):not([readonly]) {
+.form-control-color:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control-color::-moz-color-swatch {
@@ -2720,6 +2720,8 @@ textarea.form-control-lg {
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #1da332;
+}
+.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%231da332' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
@@ -2801,6 +2803,8 @@ textarea.form-control-lg {
.was-validated .form-select:invalid, .form-select.is-invalid {
border-color: #d30040;
+}
+.was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23323232' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23d30040'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx [...]
background-position: right 0.75rem center, center right 2.25rem;
@@ -3389,7 +3393,6 @@ textarea.form-control-lg {
.dropdown-menu {
position: absolute;
- top: 100%;
z-index: 1000;
display: none;
min-width: 10rem;
@@ -3404,6 +3407,7 @@ textarea.form-control-lg {
border: 1px solid rgba(0, 0, 0, 0.15);
}
.dropdown-menu[data-bs-popper] {
+ top: 100%;
left: 0;
margin-top: 0.125rem;
}
@@ -3529,12 +3533,10 @@ textarea.form-control-lg {
margin-left: 0;
}
-.dropend .dropdown-menu {
+.dropend .dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;
-}
-.dropend .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-left: 0.125rem;
}
@@ -3555,12 +3557,10 @@ textarea.form-control-lg {
vertical-align: 0;
}
-.dropstart .dropdown-menu {
+.dropstart .dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;
-}
-.dropstart .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-right: 0.125rem;
}
@@ -3756,6 +3756,7 @@ textarea.form-control-lg {
.nav-link {
display: block;
padding: 0.5rem 1rem;
+ color: #ce8636;
text-decoration: none;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
}
@@ -3764,6 +3765,9 @@ textarea.form-control-lg {
transition: none;
}
}
+.nav-link:hover, .nav-link:focus {
+ color: #8a5318;
+}
.nav-link.disabled {
color: #d7d7d7;
pointer-events: none;
@@ -4285,7 +4289,7 @@ textarea.form-control-lg {
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23164e1f'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- transform: rotate(180deg);
+ transform: rotate(-180deg);
}
.accordion-button::after {
flex-shrink: 0;
@@ -4318,12 +4322,11 @@ textarea.form-control-lg {
}
.accordion-item {
- margin-bottom: -1px;
background-color: white;
border: 1px solid rgba(0, 0, 0, 0.125);
}
-.accordion-item:last-of-type {
- margin-bottom: 0;
+.accordion-item:not(:first-of-type) {
+ border-top: 0;
}
.accordion-body {
padding: 1rem 1.25rem;
@@ -5011,7 +5014,7 @@ textarea.form-control-lg {
position: fixed;
top: 0;
left: 0;
- z-index: 1050;
+ z-index: 1040;
width: 100vw;
height: 100vh;
background-color: #000;
@@ -5060,14 +5063,6 @@ textarea.form-control-lg {
margin: 0.25rem;
}
-.modal-scrollbar-measure {
- position: absolute;
- top: -9999px;
- width: 50px;
- height: 50px;
- overflow: scroll;
-}
-
@media (min-width: 576px) {
.modal-dialog {
max-width: 600px;
@@ -5626,7 +5621,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
@@ -5652,7 +5647,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
background-color: currentColor;
border-radius: 50%;
opacity: 0;
@@ -5673,7 +5668,7 @@ textarea.form-control-lg {
.offcanvas {
position: fixed;
bottom: 0;
- z-index: 1040;
+ z-index: 1050;
display: flex;
flex-direction: column;
max-width: 100%;
@@ -5691,6 +5686,7 @@ textarea.form-control-lg {
.offcanvas-header {
display: flex;
+ align-items: center;
justify-content: space-between;
padding: 1rem 1rem;
}
@@ -5726,6 +5722,16 @@ textarea.form-control-lg {
transform: translateX(100%);
}
+.offcanvas-top {
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 30vh;
+ max-height: 100%;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ transform: translateY(-100%);
+}
+
.offcanvas-bottom {
right: 0;
left: 0;
@@ -5739,17 +5745,6 @@ textarea.form-control-lg {
transform: none;
}
-.offcanvas-backdrop::before {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1039;
- width: 100vw;
- height: 100vh;
- content: "";
- background-color: rgba(0, 0, 0, 0.5);
-}
-
.clearfix::after {
display: block;
clear: both;
diff --git a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
index 326cc87..53b11c0 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../scss/_custom.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_modules/bootstrap/scss/mixins/_lists.scss","../. [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
index 2ef7dd6..45bdcda 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -16,7 +16,7 @@
* limitations under the License.
*/
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2181,7 +2181,7 @@ progress {
.form-control[type=file] {
overflow: hidden;
}
-.form-control[type=file]:not(:disabled):not([readonly]) {
+.form-control[type=file]:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control:focus {
@@ -2198,7 +2198,7 @@ progress {
color: #6c757d;
opacity: 1;
}
-.form-control:disabled, .form-control[readonly] {
+.form-control:disabled, .form-control:read-only {
background-color: #e9ecef;
opacity: 1;
}
@@ -2221,7 +2221,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::file-selector-button {
+.form-control:hover:not(:disabled):not(:read-only)::file-selector-button {
background-color: #dde0e3;
}
.form-control::-webkit-file-upload-button {
@@ -2243,7 +2243,7 @@ progress {
transition: none;
}
}
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+.form-control:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
background-color: #dde0e3;
}
@@ -2312,7 +2312,7 @@ textarea.form-control-lg {
height: auto;
padding: 0.375rem;
}
-.form-control-color:not(:disabled):not([readonly]) {
+.form-control-color:not(:disabled):not(:read-only) {
cursor: pointer;
}
.form-control-color::-moz-color-swatch {
@@ -2735,6 +2735,8 @@ textarea.form-control-lg {
.was-validated .form-select:valid, .form-select.is-valid {
border-color: #198754;
+}
+.was-validated .form-select:valid:not([multiple]):not([size]), .was-validated .form-select:valid:not([multiple])[size="1"], .form-select.is-valid:not([multiple]):not([size]), .form-select.is-valid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3e%3cpath fill='%23198754' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
background-position: right 0.75rem center, center right 2.25rem;
@@ -2817,6 +2819,8 @@ textarea.form-control-lg {
.was-validated .form-select:invalid, .form-select.is-invalid {
border-color: #dc3545;
+}
+.was-validated .form-select:invalid:not([multiple]):not([size]), .was-validated .form-select:invalid:not([multiple])[size="1"], .form-select.is-invalid:not([multiple]):not([size]), .form-select.is-invalid:not([multiple])[size="1"] {
padding-right: 4.125rem;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e"), url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='%23dc3545'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx [...]
background-position: right 0.75rem center, center right 2.25rem;
@@ -3401,7 +3405,6 @@ textarea.form-control-lg {
.dropdown-menu {
position: absolute;
- top: 100%;
z-index: 1000;
display: none;
min-width: 10rem;
@@ -3417,6 +3420,7 @@ textarea.form-control-lg {
border-radius: 0.25rem;
}
.dropdown-menu[data-bs-popper] {
+ top: 100%;
left: 0;
margin-top: 0.125rem;
}
@@ -3542,12 +3546,10 @@ textarea.form-control-lg {
margin-left: 0;
}
-.dropend .dropdown-menu {
+.dropend .dropdown-menu[data-bs-popper] {
top: 0;
right: auto;
left: 100%;
-}
-.dropend .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-left: 0.125rem;
}
@@ -3568,12 +3570,10 @@ textarea.form-control-lg {
vertical-align: 0;
}
-.dropstart .dropdown-menu {
+.dropstart .dropdown-menu[data-bs-popper] {
top: 0;
right: 100%;
left: auto;
-}
-.dropstart .dropdown-menu[data-bs-popper] {
margin-top: 0;
margin-right: 0.125rem;
}
@@ -3792,6 +3792,7 @@ textarea.form-control-lg {
.nav-link {
display: block;
padding: 0.5rem 1rem;
+ color: #0d6efd;
text-decoration: none;
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
}
@@ -3800,6 +3801,9 @@ textarea.form-control-lg {
transition: none;
}
}
+.nav-link:hover, .nav-link:focus {
+ color: #0a58ca;
+}
.nav-link.disabled {
color: #6c757d;
pointer-events: none;
@@ -4378,7 +4382,7 @@ textarea.form-control-lg {
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- transform: rotate(180deg);
+ transform: rotate(-180deg);
}
.accordion-button::after {
flex-shrink: 0;
@@ -4411,7 +4415,6 @@ textarea.form-control-lg {
}
.accordion-item {
- margin-bottom: -1px;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.125);
}
@@ -4423,8 +4426,10 @@ textarea.form-control-lg {
border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px);
}
+.accordion-item:not(:first-of-type) {
+ border-top: 0;
+}
.accordion-item:last-of-type {
- margin-bottom: 0;
border-bottom-right-radius: 0.25rem;
border-bottom-left-radius: 0.25rem;
}
@@ -5223,7 +5228,7 @@ textarea.form-control-lg {
position: fixed;
top: 0;
left: 0;
- z-index: 1050;
+ z-index: 1040;
width: 100vw;
height: 100vh;
background-color: #000;
@@ -5276,14 +5281,6 @@ textarea.form-control-lg {
margin: 0.25rem;
}
-.modal-scrollbar-measure {
- position: absolute;
- top: -9999px;
- width: 50px;
- height: 50px;
- overflow: scroll;
-}
-
@media (min-width: 576px) {
.modal-dialog {
max-width: 500px;
@@ -5889,7 +5886,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
@@ -5915,7 +5912,7 @@ textarea.form-control-lg {
display: inline-block;
width: 2rem;
height: 2rem;
- vertical-align: text-bottom;
+ vertical-align: -0.125em;
background-color: currentColor;
border-radius: 50%;
opacity: 0;
@@ -5936,7 +5933,7 @@ textarea.form-control-lg {
.offcanvas {
position: fixed;
bottom: 0;
- z-index: 1040;
+ z-index: 1050;
display: flex;
flex-direction: column;
max-width: 100%;
@@ -5954,6 +5951,7 @@ textarea.form-control-lg {
.offcanvas-header {
display: flex;
+ align-items: center;
justify-content: space-between;
padding: 1rem 1rem;
}
@@ -5989,6 +5987,16 @@ textarea.form-control-lg {
transform: translateX(100%);
}
+.offcanvas-top {
+ top: 0;
+ right: 0;
+ left: 0;
+ height: 30vh;
+ max-height: 100%;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+ transform: translateY(-100%);
+}
+
.offcanvas-bottom {
right: 0;
left: 0;
@@ -6002,17 +6010,6 @@ textarea.form-control-lg {
transform: none;
}
-.offcanvas-backdrop::before {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1039;
- width: 100vw;
- height: 100vh;
- content: "";
- background-color: rgba(0, 0, 0, 0.5);
-}
-
.clearfix::after {
display: block;
clear: both;
diff --git a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
index ab30498..236a6f3 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/tobago-theme.scss","../../../../node_modules/bootstrap/scss/bootstrap.scss","../../../../node_modules/bootstrap/scss/_root.scss","../../../../node_modules/bootstrap/scss/_reboot.scss","../../../../node_modules/bootstrap/scss/_variables.scss","../../../../node_modules/bootstrap/scss/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/mixins/_border-radius.scss","../../../../node_modules/bootstrap/scss/_type.scss","../../../../node_mo [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/tobago.js b/tobago-theme/tobago-theme-standard/src/main/js/tobago.js
index 3a6ce33..ccb8339 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/tobago.js
+++ b/tobago-theme/tobago-theme-standard/src/main/js/tobago.js
@@ -4757,14 +4757,14 @@
});
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): util/index.js
+ * Bootstrap (v5.0.0): util/index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -4809,7 +4809,7 @@
if (hrefAttr.includes('#') && !hrefAttr.startsWith('#')) {
- hrefAttr = '#' + hrefAttr.split('#')[1];
+ hrefAttr = `#${hrefAttr.split('#')[1]}`;
}
selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : null;
@@ -4887,7 +4887,7 @@
const valueType = value && isElement(value) ? 'element' : toType(value);
if (!new RegExp(expectedTypes).test(valueType)) {
- throw new TypeError(`${componentName.toUpperCase()}: ` + `Option "${property}" provided type "${valueType}" ` + `but expected type "${expectedTypes}".`);
+ throw new TypeError(`${componentName.toUpperCase()}: Option "${property}" provided type "${valueType}" but expected type "${expectedTypes}".`);
}
});
};
@@ -4945,7 +4945,7 @@
return findShadowRoot(element.parentNode);
};
- const noop = () => function () {};
+ const noop = () => {};
const reflow = element => element.offsetHeight;
@@ -4989,9 +4989,15 @@
});
};
+ const execute = callback => {
+ if (typeof callback === 'function') {
+ callback();
+ }
+ };
+
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): dom/data.js
+ * Bootstrap (v5.0.0): dom/data.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5045,7 +5051,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): dom/event-handler.js
+ * Bootstrap (v5.0.0): dom/event-handler.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5065,6 +5071,7 @@
mouseenter: 'mouseover',
mouseleave: 'mouseout'
};
+ const customEventsRegex = /^(mouseenter|mouseleave)/i;
const nativeEvents = new Set(['click', 'dblclick', 'mouseup', 'mousedown', 'contextmenu', 'mousewheel', 'DOMMouseScroll', 'mouseover', 'mouseout', 'mousemove', 'selectstart', 'selectend', 'keydown', 'keypress', 'keyup', 'orientationchange', 'touchstart', 'touchmove', 'touchend', 'touchcancel', 'pointerdown', 'pointermove', 'pointerup', 'pointerleave', 'pointercancel', 'gesturestart', 'gesturechange', 'gestureend', 'focus', 'blur', 'change', 'reset', 'select', 'submit', 'focusin', 'focu [...]
/**
* ------------------------------------------------------------------------
@@ -5108,7 +5115,7 @@
if (handler.oneOff) {
// eslint-disable-next-line unicorn/consistent-destructuring
- EventHandler.off(element, event.type, fn);
+ EventHandler.off(element, event.type, selector, fn);
}
return fn.apply(target, [event]);
@@ -5137,15 +5144,8 @@
function normalizeParams(originalTypeEvent, handler, delegationFn) {
const delegation = typeof handler === 'string';
- const originalHandler = delegation ? delegationFn : handler; // allow to get the native events from namespaced events ('click.bs.button' --> 'click')
-
- let typeEvent = originalTypeEvent.replace(stripNameRegex, '');
- const custom = customEvents[typeEvent];
-
- if (custom) {
- typeEvent = custom;
- }
-
+ const originalHandler = delegation ? delegationFn : handler;
+ let typeEvent = getTypeEvent(originalTypeEvent);
const isNative = nativeEvents.has(typeEvent);
if (!isNative) {
@@ -5163,6 +5163,24 @@
if (!handler) {
handler = delegationFn;
delegationFn = null;
+ } // in case of mouseenter or mouseleave wrap the handler within a function that checks for its DOM position
+ // this prevents the handler from being dispatched the same way as mouseover or mouseout does
+
+
+ if (customEventsRegex.test(originalTypeEvent)) {
+ const wrapFn = fn => {
+ return function (event) {
+ if (!event.relatedTarget || event.relatedTarget !== event.delegateTarget && !event.delegateTarget.contains(event.relatedTarget)) {
+ return fn.call(this, event);
+ }
+ };
+ };
+
+ if (delegationFn) {
+ delegationFn = wrapFn(delegationFn);
+ } else {
+ handler = wrapFn(handler);
+ }
}
const [delegation, originalHandler, typeEvent] = normalizeParams(originalTypeEvent, handler, delegationFn);
@@ -5206,6 +5224,12 @@
});
}
+ function getTypeEvent(event) {
+ // allow to get the native events from namespaced events ('click.bs.button' --> 'click')
+ event = event.replace(stripNameRegex, '');
+ return customEvents[event] || event;
+ }
+
const EventHandler = {
on(element, event, handler, delegationFn) {
addHandler(element, event, handler, delegationFn, false);
@@ -5258,7 +5282,7 @@
}
const $ = getjQuery();
- const typeEvent = event.replace(stripNameRegex, '');
+ const typeEvent = getTypeEvent(event);
const inNamespace = event !== typeEvent;
const isNative = nativeEvents.has(typeEvent);
let jQueryEvent;
@@ -5316,7 +5340,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): base-component.js
+ * Bootstrap (v5.0.0): base-component.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5326,7 +5350,7 @@
* ------------------------------------------------------------------------
*/
- const VERSION = '5.0.0-beta3';
+ const VERSION = '5.0.0';
class BaseComponent {
constructor(element) {
@@ -5342,6 +5366,7 @@
dispose() {
Data.remove(this._element, this.constructor.DATA_KEY);
+ EventHandler.off(this._element, `.${this.constructor.DATA_KEY}`);
this._element = null;
}
/** Static */
@@ -5359,7 +5384,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): alert.js
+ * Bootstrap (v5.0.0): alert.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5369,7 +5394,7 @@
* ------------------------------------------------------------------------
*/
- const NAME$b = 'alert';
+ const NAME$c = 'alert';
const DATA_KEY$b = 'bs.alert';
const EVENT_KEY$b = `.${DATA_KEY$b}`;
const DATA_API_KEY$8 = '.data-api';
@@ -5378,8 +5403,8 @@
const EVENT_CLOSED = `closed${EVENT_KEY$b}`;
const EVENT_CLICK_DATA_API$7 = `click${EVENT_KEY$b}${DATA_API_KEY$8}`;
const CLASS_NAME_ALERT = 'alert';
- const CLASS_NAME_FADE$5 = 'fade';
- const CLASS_NAME_SHOW$8 = 'show';
+ const CLASS_NAME_FADE$6 = 'fade';
+ const CLASS_NAME_SHOW$9 = 'show';
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -5415,9 +5440,9 @@
}
_removeElement(element) {
- element.classList.remove(CLASS_NAME_SHOW$8);
+ element.classList.remove(CLASS_NAME_SHOW$9);
- if (!element.classList.contains(CLASS_NAME_FADE$5)) {
+ if (!element.classList.contains(CLASS_NAME_FADE$6)) {
this._destroyElement(element);
return;
@@ -5477,11 +5502,11 @@
* add .Alert to jQuery only if jQuery is present
*/
- defineJQueryPlugin(NAME$b, Alert);
+ defineJQueryPlugin(NAME$c, Alert);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): button.js
+ * Bootstrap (v5.0.0): button.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5491,7 +5516,7 @@
* ------------------------------------------------------------------------
*/
- const NAME$a = 'button';
+ const NAME$b = 'button';
const DATA_KEY$a = 'bs.button';
const EVENT_KEY$a = `.${DATA_KEY$a}`;
const DATA_API_KEY$7 = '.data-api';
@@ -5557,11 +5582,11 @@
* add .Button to jQuery only if jQuery is present
*/
- defineJQueryPlugin(NAME$a, Button);
+ defineJQueryPlugin(NAME$b, Button);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): dom/manipulator.js
+ * Bootstrap (v5.0.0): dom/manipulator.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5635,7 +5660,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): dom/selector-engine.js
+ * Bootstrap (v5.0.0): dom/selector-engine.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5706,7 +5731,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): carousel.js
+ * Bootstrap (v5.0.0): carousel.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -5716,7 +5741,7 @@
* ------------------------------------------------------------------------
*/
- const NAME$9 = 'carousel';
+ const NAME$a = 'carousel';
const DATA_KEY$9 = 'bs.carousel';
const EVENT_KEY$9 = `.${DATA_KEY$9}`;
const DATA_API_KEY$6 = '.data-api';
@@ -5725,7 +5750,7 @@
const TOUCHEVENT_COMPAT_WAIT = 500; // Time for mouse compat events to fire after touch
const SWIPE_THRESHOLD = 40;
- const Default$8 = {
+ const Default$9 = {
interval: 5000,
keyboard: true,
slide: false,
@@ -5733,7 +5758,7 @@
wrap: true,
touch: true
};
- const DefaultType$8 = {
+ const DefaultType$9 = {
interval: '(number|boolean)',
keyboard: 'boolean',
slide: '(boolean|string)',
@@ -5804,7 +5829,7 @@
static get Default() {
- return Default$8;
+ return Default$9;
}
static get DATA_KEY() {
@@ -5889,7 +5914,6 @@
}
dispose() {
- EventHandler.off(this._element, EVENT_KEY$9);
this._items = null;
this._config = null;
this._interval = null;
@@ -5902,10 +5926,10 @@
_getConfig(config) {
- config = { ...Default$8,
+ config = { ...Default$9,
...config
};
- typeCheckConfig(NAME$9, config, DefaultType$8);
+ typeCheckConfig(NAME$a, config, DefaultType$9);
return config;
}
@@ -6004,11 +6028,11 @@
if (event.key === ARROW_LEFT_KEY) {
event.preventDefault();
- this._slide(DIRECTION_LEFT);
+ this._slide(DIRECTION_RIGHT);
} else if (event.key === ARROW_RIGHT_KEY) {
event.preventDefault();
- this._slide(DIRECTION_RIGHT);
+ this._slide(DIRECTION_LEFT);
}
}
@@ -6170,10 +6194,10 @@
}
if (isRTL()) {
- return direction === DIRECTION_RIGHT ? ORDER_PREV : ORDER_NEXT;
+ return direction === DIRECTION_LEFT ? ORDER_PREV : ORDER_NEXT;
}
- return direction === DIRECTION_RIGHT ? ORDER_NEXT : ORDER_PREV;
+ return direction === DIRECTION_LEFT ? ORDER_NEXT : ORDER_PREV;
}
_orderToDirection(order) {
@@ -6182,16 +6206,16 @@
}
if (isRTL()) {
- return order === ORDER_NEXT ? DIRECTION_LEFT : DIRECTION_RIGHT;
+ return order === ORDER_PREV ? DIRECTION_LEFT : DIRECTION_RIGHT;
}
- return order === ORDER_NEXT ? DIRECTION_RIGHT : DIRECTION_LEFT;
+ return order === ORDER_PREV ? DIRECTION_RIGHT : DIRECTION_LEFT;
} // Static
static carouselInterface(element, config) {
let data = Data.get(element, DATA_KEY$9);
- let _config = { ...Default$8,
+ let _config = { ...Default$9,
...Manipulator.getDataAttributes(element)
};
@@ -6275,11 +6299,11 @@
* add .Carousel to jQuery only if jQuery is present
*/
- defineJQueryPlugin(NAME$9, Carousel);
+ defineJQueryPlugin(NAME$a, Carousel);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): collapse.js
+ * Bootstrap (v5.0.0): collapse.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -6289,15 +6313,15 @@
* ------------------------------------------------------------------------
*/
- const NAME$8 = 'collapse';
+ const NAME$9 = 'collapse';
const DATA_KEY$8 = 'bs.collapse';
const EVENT_KEY$8 = `.${DATA_KEY$8}`;
const DATA_API_KEY$5 = '.data-api';
- const Default$7 = {
+ const Default$8 = {
toggle: true,
parent: ''
};
- const DefaultType$7 = {
+ const DefaultType$8 = {
toggle: 'boolean',
parent: '(string|element)'
};
@@ -6306,7 +6330,7 @@
const EVENT_HIDE$5 = `hide${EVENT_KEY$8}`;
const EVENT_HIDDEN$5 = `hidden${EVENT_KEY$8}`;
const EVENT_CLICK_DATA_API$4 = `click${EVENT_KEY$8}${DATA_API_KEY$5}`;
- const CLASS_NAME_SHOW$7 = 'show';
+ const CLASS_NAME_SHOW$8 = 'show';
const CLASS_NAME_COLLAPSE = 'collapse';
const CLASS_NAME_COLLAPSING = 'collapsing';
const CLASS_NAME_COLLAPSED = 'collapsed';
@@ -6353,7 +6377,7 @@
static get Default() {
- return Default$7;
+ return Default$8;
}
static get DATA_KEY() {
@@ -6362,7 +6386,7 @@
toggle() {
- if (this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+ if (this._element.classList.contains(CLASS_NAME_SHOW$8)) {
this.hide();
} else {
this.show();
@@ -6370,7 +6394,7 @@
}
show() {
- if (this._isTransitioning || this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+ if (this._isTransitioning || this._element.classList.contains(CLASS_NAME_SHOW$8)) {
return;
}
@@ -6440,7 +6464,7 @@
const complete = () => {
this._element.classList.remove(CLASS_NAME_COLLAPSING);
- this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$7);
+ this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$8);
this._element.style[dimension] = '';
this.setTransitioning(false);
@@ -6456,7 +6480,7 @@
}
hide() {
- if (this._isTransitioning || !this._element.classList.contains(CLASS_NAME_SHOW$7)) {
+ if (this._isTransitioning || !this._element.classList.contains(CLASS_NAME_SHOW$8)) {
return;
}
@@ -6473,7 +6497,7 @@
this._element.classList.add(CLASS_NAME_COLLAPSING);
- this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$7);
+ this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW$8);
const triggerArrayLength = this._triggerArray.length;
@@ -6482,7 +6506,7 @@
const trigger = this._triggerArray[i];
const elem = getElementFromSelector(trigger);
- if (elem && !elem.classList.contains(CLASS_NAME_SHOW$7)) {
+ if (elem && !elem.classList.contains(CLASS_NAME_SHOW$8)) {
trigger.classList.add(CLASS_NAME_COLLAPSED);
trigger.setAttribute('aria-expanded', false);
}
@@ -6521,12 +6545,12 @@
_getConfig(config) {
- config = { ...Default$7,
+ config = { ...Default$8,
...config
};
config.toggle = Boolean(config.toggle); // Coerce string values
- typeCheckConfig(NAME$8, config, DefaultType$7);
+ typeCheckConfig(NAME$9, config, DefaultType$8);
return config;
}
@@ -6562,7 +6586,7 @@
return;
}
- const isOpen = element.classList.contains(CLASS_NAME_SHOW$7);
+ const isOpen = element.classList.contains(CLASS_NAME_SHOW$8);
triggerArray.forEach(elem => {
if (isOpen) {
elem.classList.remove(CLASS_NAME_COLLAPSED);
@@ -6577,7 +6601,7 @@
static collapseInterface(element, config) {
let data = Data.get(element, DATA_KEY$8);
- const _config = { ...Default$7,
+ const _config = { ...Default$8,
...Manipulator.getDataAttributes(element),
...(typeof config === 'object' && config ? config : {})
};
@@ -6648,11 +6672,11 @@
* add .Collapse to jQuery only if jQuery is present
*/
- defineJQueryPlugin(NAME$8, Collapse$1);
+ defineJQueryPlugin(NAME$9, Collapse$1);
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): dropdown.js
+ * Bootstrap (v5.0.0): dropdown.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -6662,7 +6686,7 @@
* ------------------------------------------------------------------------
*/
- const NAME$7 = 'dropdown';
+ const NAME$8 = 'dropdown';
const DATA_KEY$7 = 'bs.dropdown';
const EVENT_KEY$7 = `.${DATA_KEY$7}`;
const DATA_API_KEY$4 = '.data-api';
@@ -6682,8 +6706,7 @@
const EVENT_CLICK_DATA_API$3 = `click${EVENT_KEY$7}${DATA_API_KEY$4}`;
const EVENT_KEYDOWN_DATA_API = `keydown${EVENT_KEY$7}${DATA_API_KEY$4}`;
const EVENT_KEYUP_DATA_API = `keyup${EVENT_KEY$7}${DATA_API_KEY$4}`;
- const CLASS_NAME_DISABLED = 'disabled';
- const CLASS_NAME_SHOW$6 = 'show';
+ const CLASS_NAME_SHOW$7 = 'show';
const CLASS_NAME_DROPUP = 'dropup';
const CLASS_NAME_DROPEND = 'dropend';
const CLASS_NAME_DROPSTART = 'dropstart';
@@ -6698,19 +6721,21 @@
const PLACEMENT_BOTTOMEND = isRTL() ? 'bottom-start' : 'bottom-end';
const PLACEMENT_RIGHT = isRTL() ? 'left-start' : 'right-start';
const PLACEMENT_LEFT = isRTL() ? 'right-start' : 'left-start';
- const Default$6 = {
+ const Default$7 = {
offset: [0, 2],
boundary: 'clippingParents',
reference: 'toggle',
display: 'dynamic',
- popperConfig: null
+ popperConfig: null,
+ autoClose: true
};
- const DefaultType$6 = {
+ const DefaultType$7 = {
offset: '(array|string|function)',
boundary: '(string|element)',
reference: '(string|element|object)',
display: 'string',
- popperConfig: '(null|object|function)'
+ popperConfig: '(null|object|function)',
+ autoClose: '(boolean|string)'
};
/**
* ------------------------------------------------------------------------
@@ -6731,11 +6756,11 @@
static get Default() {
- return Default$6;
+ return Default$7;
}
static get DefaultType() {
- return DefaultType$6;
+ return DefaultType$7;
}
static get DATA_KEY() {
@@ -6744,15 +6769,14 @@
toggle() {
- if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED)) {
+ if (isDisabled(this._element)) {
return;
}
- const isActive = this._element.classList.contains(CLASS_NAME_SHOW$6);
-
- Dropdown.clearMenus();
+ const isActive = this._element.classList.contains(CLASS_NAME_SHOW$7);
if (isActive) {
+ this.hide();
return;
}
@@ -6760,7 +6784,7 @@
}
show() {
- if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED) || this._menu.classList.contains(CLASS_NAME_SHOW$6)) {
+ if (isDisabled(this._element) || this._menu.classList.contains(CLASS_NAME_SHOW$7)) {
return;
}
@@ -6811,48 +6835,33 @@
if ('ontouchstart' in document.documentElement && !parent.closest(SELECTOR_NAVBAR_NAV)) {
- [].concat(...document.body.children).forEach(elem => EventHandler.on(elem, 'mouseover', null, noop()));
+ [].concat(...document.body.children).forEach(elem => EventHandler.on(elem, 'mouseover', noop));
}
this._element.focus();
this._element.setAttribute('aria-expanded', true);
- this._menu.classList.toggle(CLASS_NAME_SHOW$6);
+ this._menu.classList.toggle(CLASS_NAME_SHOW$7);
- this._element.classList.toggle(CLASS_NAME_SHOW$6);
+ this._element.classList.toggle(CLASS_NAME_SHOW$7);
EventHandler.trigger(this._element, EVENT_SHOWN$4, relatedTarget);
}
hide() {
- if (this._element.disabled || this._element.classList.contains(CLASS_NAME_DISABLED) || !this._menu.classList.contains(CLASS_NAME_SHOW$6)) {
+ if (isDisabled(this._element) || !this._menu.classList.contains(CLASS_NAME_SHOW$7)) {
return;
}
const relatedTarget = {
relatedTarget: this._element
};
- const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$4, relatedTarget);
-
- if (hideEvent.defaultPrevented) {
- return;
- }
-
- if (this._popper) {
- this._popper.destroy();
- }
-
- this._menu.classList.toggle(CLASS_NAME_SHOW$6);
-
- this._element.classList.toggle(CLASS_NAME_SHOW$6);
- Manipulator.removeDataAttribute(this._menu, 'popper');
- EventHandler.trigger(this._element, EVENT_HIDDEN$4, relatedTarget);
+ this._completeHide(relatedTarget);
}
dispose() {
- EventHandler.off(this._element, EVENT_KEY$7);
this._menu = null;
if (this._popper) {
@@ -6880,16 +6889,43 @@
});
}
+ _completeHide(relatedTarget) {
+ const hideEvent = EventHandler.trigger(this._element, EVENT_HIDE$4, relatedTarget);
+
+ if (hideEvent.defaultPrevented) {
+ return;
+ } // If this is a touch-enabled device we remove the extra
+ // empty mouseover listeners we added for iOS support
+
+
+ if ('ontouchstart' in document.documentElement) {
+ [].concat(...document.body.children).forEach(elem => EventHandler.off(elem, 'mouseover', noop));
+ }
+
+ if (this._popper) {
+ this._popper.destroy();
+ }
+
+ this._menu.classList.remove(CLASS_NAME_SHOW$7);
+
+ this._element.classList.remove(CLASS_NAME_SHOW$7);
+
+ this._element.setAttribute('aria-expanded', 'false');
+
+ Manipulator.removeDataAttribute(this._menu, 'popper');
+ EventHandler.trigger(this._element, EVENT_HIDDEN$4, relatedTarget);
+ }
+
_getConfig(config) {
config = { ...this.constructor.Default,
...Manipulator.getDataAttributes(this._element),
...config
};
- typeCheckConfig(NAME$7, config, this.constructor.DefaultType);
+ typeCheckConfig(NAME$8, config, this.constructor.DefaultType);
if (typeof config.reference === 'object' && !isElement(config.reference) && typeof config.reference.getBoundingClientRect !== 'function') {
// Popper virtual elements require a getBoundingClientRect method
- throw new TypeError(`${NAME$7.toUpperCase()}: Option "reference" provided type "object" without a required "getBoundingClientRect" method.`);
+ throw new TypeError(`${NAME$8.toUpperCase()}: Option "reference" provided type "object" without a required "getBoundingClientRect" method.`);
}
return config;
@@ -6966,6 +7002,29 @@
return { ...defaultBsPopperConfig,
...(typeof this._config.popperConfig === 'function' ? this._config.popperConfig(defaultBsPopperConfig) : this._config.popperConfig)
};
+ }
+
+ _selectMenuItem(event) {
+ const items = SelectorEngine.find(SELECTOR_VISIBLE_ITEMS, this._menu).filter(isVisible);
+
+ if (!items.length) {
+ return;
+ }
+
+ let index = items.indexOf(event.target); // Up
+
+ if (event.key === ARROW_UP_KEY && index > 0) {
+ index--;
+ } // Down
+
+
+ if (event.key === ARROW_DOWN_KEY && index < items.length - 1) {
+ index++;
+ } // index is -1 if the first keydown is an ArrowUp
+
+
+ index = index === -1 ? 0 : index;
+ items[index].focus();
} // Static
@@ -6999,7 +7058,7 @@
return;
}
- if (/input|select|textarea|form/i.test(event.target.tagName)) {
+ if (/input|select|option|textarea|form/i.test(event.target.tagName)) {
return;
}
}
@@ -7008,58 +7067,38 @@
for (let i = 0, len = toggles.length; i < len; i++) {
const context = Data.get(toggles[i], DATA_KEY$7);
- const relatedTarget = {
- relatedTarget: toggles[i]
- };
- if (event && event.type === 'click') {
- relatedTarget.clickEvent = event;
- }
-
- if (!context) {
+ if (!context || context._config.autoClose === false) {
continue;
}
- const dropdownMenu = context._menu;
-
- if (!toggles[i].classList.contains(CLASS_NAME_SHOW$6)) {
+ if (!context._element.classList.contains(CLASS_NAME_SHOW$7)) {
continue;
}
+ const relatedTarget = {
+ relatedTarget: context._element
+ };
+
if (event) {
- // Don't close the menu if the clicked element or one of its parents is the dropdown button
- if ([context._element].some(element => event.composedPath().includes(element))) {
+ const composedPath = event.composedPath();
+ const isMenuTarget = composedPath.includes(context._menu);
+
+ if (composedPath.includes(context._element) || context._config.autoClose === 'inside' && !isMenuTarget || context._config.autoClose === 'outside' && isMenuTarget) {
continue;
} // Tab navigation through the dropdown menu shouldn't close the menu
- if (event.type === 'keyup' && event.key === TAB_KEY && dropdownMenu.contains(event.target)) {
+ if (event.type === 'keyup' && event.key === TAB_KEY && context._menu.contains(event.target)) {
continue;
}
- }
-
- const hideEvent = EventHandler.trigger(toggles[i], EVENT_HIDE$4, relatedTarget);
-
- if (hideEvent.defaultPrevented) {
- continue;
- } // If this is a touch-enabled device we remove the extra
- // empty mouseover listeners we added for iOS support
-
-
- if ('ontouchstart' in document.documentElement) {
- [].concat(...document.body.children).forEach(elem => EventHandler.off(elem, 'mouseover', null, noop()));
- }
-
- toggles[i].setAttribute('aria-expanded', 'false');
- if (context._popper) {
- context._popper.destroy();
+ if (event.type === 'click') {
+ relatedTarget.clickEvent = event;
+ }
}
- dropdownMenu.classList.remove(CLASS_NAME_SHOW$6);
- toggles[i].classList.remove(CLASS_NAME_SHOW$6);
- Manipulator.removeDataAttribute(dropdownMenu, 'popper');
- EventHandler.trigger(toggles[i], EVENT_HIDDEN$4, relatedTarget);
+ context._completeHide(relatedTarget);
}
}
@@ -7079,26 +7118,29 @@
return;
}
+ const isActive = this.classList.contains(CLASS_NAME_SHOW$7);
+
+ if (!isActive && event.key === ESCAPE_KEY$2) {
+ return;
+ }
+
event.preventDefault();
event.stopPropagation();
- if (this.disabled || this.classList.contains(CLASS_NAME_DISABLED)) {
+ if (isDisabled(this)) {
return;
}
- const parent = Dropdown.getParentFromElement(this);
- const isActive = this.classList.contains(CLASS_NAME_SHOW$6);
+ const getToggleButton = () => this.matches(SELECTOR_DATA_TOGGLE$3) ? this : SelectorEngine.prev(this, SELECTOR_DATA_TOGGLE$3)[0];
if (event.key === ESCAPE_KEY$2) {
- const button = this.matches(SELECTOR_DATA_TOGGLE$3) ? this : SelectorEngine.prev(this, SELECTOR_DATA_TOGGLE$3)[0];
- button.focus();
+ getToggleButton().focus();
Dropdown.clearMenus();
return;
}
if (!isActive && (event.key === ARROW_UP_KEY || event.key === ARROW_DOWN_KEY)) {
- const button = this.matches(SELECTOR_DATA_TOGGLE$3) ? this : SelectorEngine.prev(this, SELECTOR_DATA_TOGGLE$3)[0];
- button.click();
+ getToggleButton().click();
return;
}
@@ -7107,26 +7149,7 @@
return;
}
- const items = SelectorEngine.find(SELECTOR_VISIBLE_ITEMS, parent).filter(isVisible);
-
- if (!items.length) {
- return;
- }
-
- let index = items.indexOf(event.target); // Up
-
- if (event.key === ARROW_UP_KEY && index > 0) {
- index--;
- } // Down
-
-
- if (event.key === ARROW_DOWN_KEY && index < items.length - 1) {
- index++;
- } // index is -1 if the first keydown is an ArrowUp
-
-
- index = index === -1 ? 0 : index;
- items[index].focus();
+ Dropdown.getInstance(getToggleButton())._selectMenuItem(event);
}
}
@@ -7152,11 +7175,213 @@
* add .Dropdown to jQuery only if jQuery is present
*/
- defineJQueryPlugin(NAME$7, Dropdown);
+ defineJQueryPlugin(NAME$8, Dropdown);
+
+ /**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.0.0): util/scrollBar.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+ const SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
+ const SELECTOR_STICKY_CONTENT = '.sticky-top';
+
+ const getWidth = () => {
+ // https://developer.mozilla.org/en-US/docs/Web/API/Window/innerWidth#usage_notes
+ const documentWidth = document.documentElement.clientWidth;
+ return Math.abs(window.innerWidth - documentWidth);
+ };
+
+ const hide = (width = getWidth()) => {
+ _disableOverFlow(); // give padding to element to balances the hidden scrollbar width
+
+
+ _setElementAttributes('body', 'paddingRight', calculatedValue => calculatedValue + width); // trick: We adjust positive paddingRight and negative marginRight to sticky-top elements, to keep shown fullwidth
+
+
+ _setElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight', calculatedValue => calculatedValue + width);
+
+ _setElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight', calculatedValue => calculatedValue - width);
+ };
+
+ const _disableOverFlow = () => {
+ const actualValue = document.body.style.overflow;
+
+ if (actualValue) {
+ Manipulator.setDataAttribute(document.body, 'overflow', actualValue);
+ }
+
+ document.body.style.overflow = 'hidden';
+ };
+
+ const _setElementAttributes = (selector, styleProp, callback) => {
+ const scrollbarWidth = getWidth();
+ SelectorEngine.find(selector).forEach(element => {
+ if (element !== document.body && window.innerWidth > element.clientWidth + scrollbarWidth) {
+ return;
+ }
+
+ const actualValue = element.style[styleProp];
+ const calculatedValue = window.getComputedStyle(element)[styleProp];
+ Manipulator.setDataAttribute(element, styleProp, actualValue);
+ element.style[styleProp] = `${callback(Number.parseFloat(calculatedValue))}px`;
+ });
+ };
+
+ const reset = () => {
+ _resetElementAttributes('body', 'overflow');
+
+ _resetElementAttributes('body', 'paddingRight');
+
+ _resetElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight');
+
+ _resetElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight');
+ };
+
+ const _resetElementAttributes = (selector, styleProp) => {
+ SelectorEngine.find(selector).forEach(element => {
+ const value = Manipulator.getDataAttribute(element, styleProp);
+
+ if (typeof value === 'undefined') {
+ element.style.removeProperty(styleProp);
+ } else {
+ Manipulator.removeDataAttribute(element, styleProp);
+ element.style[styleProp] = value;
+ }
+ });
+ };
+
+ /**
+ * --------------------------------------------------------------------------
+ * Bootstrap (v5.0.0): util/backdrop.js
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * --------------------------------------------------------------------------
+ */
+ const Default$6 = {
+ isVisible: true,
+ // if false, we use the backdrop helper without adding any element to the dom
+ isAnimated: false,
+ rootElement: document.body,
+ // give the choice to place backdrop under different elements
+ clickCallback: null
+ };
+ const DefaultType$6 = {
+ isVisible: 'boolean',
+ isAnimated: 'boolean',
+ rootElement: 'element',
+ clickCallback: '(function|null)'
+ };
+ const NAME$7 = 'backdrop';
+ const CLASS_NAME_BACKDROP = 'modal-backdrop';
+ const CLASS_NAME_FADE$5 = 'fade';
+ const CLASS_NAME_SHOW$6 = 'show';
+ const EVENT_MOUSEDOWN = `mousedown.bs.${NAME$7}`;
+
+ class Backdrop {
+ constructor(config) {
+ this._config = this._getConfig(config);
+ this._isAppended = false;
+ this._element = null;
+ }
+
+ show(callback) {
+ if (!this._config.isVisible) {
+ execute(callback);
+ return;
+ }
+
+ this._append();
+
+ if (this._config.isAnimated) {
+ reflow(this._getElement());
+ }
+
+ this._getElement().classList.add(CLASS_NAME_SHOW$6);
+
+ this._emulateAnimation(() => {
+ execute(callback);
+ });
+ }
+
+ hide(callback) {
+ if (!this._config.isVisible) {
+ execute(callback);
+ return;
+ }
+
+ this._getElement().classList.remove(CLASS_NAME_SHOW$6);
+
+ this._emulateAnimation(() => {
+ this.dispose();
+ execute(callback);
+ });
+ } // Private
+
+
+ _getElement() {
+ if (!this._element) {
+ const backdrop = document.createElement('div');
+ backdrop.className = CLASS_NAME_BACKDROP;
+
+ if (this._config.isAnimated) {
+ backdrop.classList.add(CLASS_NAME_FADE$5);
+ }
+
+ this._element = backdrop;
+ }
+
+ return this._element;
+ }
+
+ _getConfig(config) {
+ config = { ...Default$6,
+ ...(typeof config === 'object' ? config : {})
+ };
+ typeCheckConfig(NAME$7, config, DefaultType$6);
+ return config;
+ }
+
+ _append() {
+ if (this._isAppended) {
+ return;
+ }
+
+ this._config.rootElement.appendChild(this._getElement());
+
+ EventHandler.on(this._getElement(), EVENT_MOUSEDOWN, () => {
+ execute(this._config.clickCallback);
+ });
+ this._isAppended = true;
+ }
+
+ dispose() {
+ if (!this._isAppended) {
+ return;
+ }
+
+ EventHandler.off(this._element, EVENT_MOUSEDOWN);
+
+ this._getElement().parentNode.removeChild(this._element);
+
+ this._isAppended = false;
+ }
+
+ _emulateAnimation(callback) {
+ if (!this._config.isAnimated) {
+ execute(callback);
+ return;
+ }
+
+ const backdropTransitionDuration = getTransitionDurationFromElement(this._getElement());
+ EventHandler.one(this._getElement(), 'transitionend', () => execute(callback));
+ emulateTransitionEnd(this._getElement(), backdropTransitionDuration);
+ }
+
+ }
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): modal.js
+ * Bootstrap (v5.0.0): modal.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -7189,12 +7414,10 @@
const EVENT_FOCUSIN$1 = `focusin${EVENT_KEY$6}`;
const EVENT_RESIZE = `resize${EVENT_KEY$6}`;
const EVENT_CLICK_DISMISS$2 = `click.dismiss${EVENT_KEY$6}`;
- const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY$6}`;
+ const EVENT_KEYDOWN_DISMISS$1 = `keydown.dismiss${EVENT_KEY$6}`;
const EVENT_MOUSEUP_DISMISS = `mouseup.dismiss${EVENT_KEY$6}`;
const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY$6}`;
const EVENT_CLICK_DATA_API$2 = `click${EVENT_KEY$6}${DATA_API_KEY$3}`;
- const CLASS_NAME_SCROLLBAR_MEASURER = 'modal-scrollbar-measure';
- const CLASS_NAME_BACKDROP = 'modal-backdrop';
const CLASS_NAME_OPEN = 'modal-open';
const CLASS_NAME_FADE$4 = 'fade';
const CLASS_NAME_SHOW$5 = 'show';
@@ -7203,8 +7426,6 @@
const SELECTOR_MODAL_BODY = '.modal-body';
const SELECTOR_DATA_TOGGLE$2 = '[data-bs-toggle="modal"]';
const SELECTOR_DATA_DISMISS$2 = '[data-bs-dismiss="modal"]';
- const SELECTOR_FIXED_CONTENT$1 = '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top';
- const SELECTOR_STICKY_CONTENT$1 = '.sticky-top';
/**
* ------------------------------------------------------------------------
* Class Definition
@@ -7216,12 +7437,10 @@
super(element);
this._config = this._getConfig(config);
this._dialog = SelectorEngine.findOne(SELECTOR_DIALOG, this._element);
- this._backdrop = null;
+ this._backdrop = this._initializeBackDrop();
this._isShown = false;
- this._isBodyOverflowing = false;
this._ignoreBackdropClick = false;
this._isTransitioning = false;
- this._scrollbarWidth = 0;
} // Getters
@@ -7256,10 +7475,8 @@
}
this._isShown = true;
-
- this._checkScrollbar();
-
- this._setScrollbar();
+ hide();
+ document.body.classList.add(CLASS_NAME_OPEN);
this._adjustDialog();
@@ -7323,7 +7540,7 @@
}
dispose() {
- [window, this._element, this._dialog].forEach(htmlElement => EventHandler.off(htmlElement, EVENT_KEY$6));
+ [window, this._dialog].forEach(htmlElement => EventHandler.off(htmlElement, EVENT_KEY$6));
super.dispose();
/**
* `document` has 2 events `EVENT_FOCUSIN` and `EVENT_CLICK_DATA_API`
@@ -7334,12 +7551,13 @@
EventHandler.off(document, EVENT_FOCUSIN$1);
this._config = null;
this._dialog = null;
+
+ this._backdrop.dispose();
+
this._backdrop = null;
this._isShown = null;
- this._isBodyOverflowing = null;
this._ignoreBackdropClick = null;
this._isTransitioning = null;
- this._scrollbarWidth = null;
}
handleUpdate() {
@@ -7347,8 +7565,17 @@
} // Private
+ _initializeBackDrop() {
+ return new Backdrop({
+ isVisible: Boolean(this._config.backdrop),
+ // 'static' option will be translated to true, and booleans will keep their value
+ isAnimated: this._isAnimated()
+ });
+ }
+
_getConfig(config) {
config = { ...Default$5,
+ ...Manipulator.getDataAttributes(this._element),
...config
};
typeCheckConfig(NAME$6, config, DefaultType$5);
@@ -7421,7 +7648,7 @@
_setEscapeEvent() {
if (this._isShown) {
- EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS, event => {
+ EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS$1, event => {
if (this._config.keyboard && event.key === ESCAPE_KEY$1) {
event.preventDefault();
this.hide();
@@ -7430,7 +7657,7 @@
}
});
} else {
- EventHandler.off(this._element, EVENT_KEYDOWN_DISMISS);
+ EventHandler.off(this._element, EVENT_KEYDOWN_DISMISS$1);
}
}
@@ -7453,85 +7680,35 @@
this._isTransitioning = false;
- this._showBackdrop(() => {
+ this._backdrop.hide(() => {
document.body.classList.remove(CLASS_NAME_OPEN);
this._resetAdjustments();
- this._resetScrollbar();
-
+ reset();
EventHandler.trigger(this._element, EVENT_HIDDEN$3);
});
}
- _removeBackdrop() {
- this._backdrop.parentNode.removeChild(this._backdrop);
-
- this._backdrop = null;
- }
-
_showBackdrop(callback) {
- const isAnimated = this._isAnimated();
-
- if (this._isShown && this._config.backdrop) {
- this._backdrop = document.createElement('div');
- this._backdrop.className = CLASS_NAME_BACKDROP;
-
- if (isAnimated) {
- this._backdrop.classList.add(CLASS_NAME_FADE$4);
- }
-
- document.body.appendChild(this._backdrop);
- EventHandler.on(this._element, EVENT_CLICK_DISMISS$2, event => {
- if (this._ignoreBackdropClick) {
- this._ignoreBackdropClick = false;
- return;
- }
-
- if (event.target !== event.currentTarget) {
- return;
- }
-
- if (this._config.backdrop === 'static') {
- this._triggerBackdropTransition();
- } else {
- this.hide();
- }
- });
-
- if (isAnimated) {
- reflow(this._backdrop);
+ EventHandler.on(this._element, EVENT_CLICK_DISMISS$2, event => {
+ if (this._ignoreBackdropClick) {
+ this._ignoreBackdropClick = false;
+ return;
}
- this._backdrop.classList.add(CLASS_NAME_SHOW$5);
-
- if (!isAnimated) {
- callback();
+ if (event.target !== event.currentTarget) {
return;
}
- const backdropTransitionDuration = getTransitionDurationFromElement(this._backdrop);
- EventHandler.one(this._backdrop, 'transitionend', callback);
- emulateTransitionEnd(this._backdrop, backdropTransitionDuration);
- } else if (!this._isShown && this._backdrop) {
- this._backdrop.classList.remove(CLASS_NAME_SHOW$5);
-
- const callbackRemove = () => {
- this._removeBackdrop();
-
- callback();
- };
-
- if (isAnimated) {
- const backdropTransitionDuration = getTransitionDurationFromElement(this._backdrop);
- EventHandler.one(this._backdrop, 'transitionend', callbackRemove);
- emulateTransitionEnd(this._backdrop, backdropTransitionDuration);
- } else {
- callbackRemove();
+ if (this._config.backdrop === true) {
+ this.hide();
+ } else if (this._config.backdrop === 'static') {
+ this._triggerBackdropTransition();
}
- } else {
- callback();
- }
+ });
+
+ this._backdrop.show(callback);
}
_isAnimated() {
@@ -7575,103 +7752,37 @@
_adjustDialog() {
const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight;
+ const scrollbarWidth = getWidth();
+ const isBodyOverflowing = scrollbarWidth > 0;
- if (!this._isBodyOverflowing && isModalOverflowing && !isRTL() || this._isBodyOverflowing && !isModalOverflowing && isRTL()) {
- this._element.style.paddingLeft = `${this._scrollbarWidth}px`;
+ if (!isBodyOverflowing && isModalOverflowing && !isRTL() || isBodyOverflowing && !isModalOverflowing && isRTL()) {
+ this._element.style.paddingLeft = `${scrollbarWidth}px`;
}
- if (this._isBodyOverflowing && !isModalOverflowing && !isRTL() || !this._isBodyOverflowing && isModalOverflowing && isRTL()) {
- this._element.style.paddingRight = `${this._scrollbarWidth}px`;
+ if (isBodyOverflowing && !isModalOverflowing && !isRTL() || !isBodyOverflowing && isModalOverflowing && isRTL()) {
+ this._element.style.paddingRight = `${scrollbarWidth}px`;
}
}
_resetAdjustments() {
this._element.style.paddingLeft = '';
this._element.style.paddingRight = '';
- }
-
- _checkScrollbar() {
- const rect = document.body.getBoundingClientRect();
- this._isBodyOverflowing = Math.round(rect.left + rect.right) < window.innerWidth;
- this._scrollbarWidth = this._getScrollbarWidth();
- }
-
- _setScrollbar() {
- if (this._isBodyOverflowing) {
- this._setElementAttributes(SELECTOR_FIXED_CONTENT$1, 'paddingRight', calculatedValue => calculatedValue + this._scrollbarWidth);
-
- this._setElementAttributes(SELECTOR_STICKY_CONTENT$1, 'marginRight', calculatedValue => calculatedValue - this._scrollbarWidth);
-
- this._setElementAttributes('body', 'paddingRight', calculatedValue => calculatedValue + this._scrollbarWidth);
- }
-
- document.body.classList.add(CLASS_NAME_OPEN);
- }
-
- _setElementAttributes(selector, styleProp, callback) {
- SelectorEngine.find(selector).forEach(element => {
- if (element !== document.body && window.innerWidth > element.clientWidth + this._scrollbarWidth) {
- return;
- }
-
- const actualValue = element.style[styleProp];
- const calculatedValue = window.getComputedStyle(element)[styleProp];
- Manipulator.setDataAttribute(element, styleProp, actualValue);
- element.style[styleProp] = callback(Number.parseFloat(calculatedValue)) + 'px';
- });
- }
-
- _resetScrollbar() {
- this._resetElementAttributes(SELECTOR_FIXED_CONTENT$1, 'paddingRight');
-
- this._resetElementAttributes(SELECTOR_STICKY_CONTENT$1, 'marginRight');
-
- this._resetElementAttributes('body', 'paddingRight');
- }
-
- _resetElementAttributes(selector, styleProp) {
- SelectorEngine.find(selector).forEach(element => {
- const value = Manipulator.getDataAttribute(element, styleProp);
-
- if (typeof value === 'undefined' && element === document.body) {
- element.style[styleProp] = '';
- } else {
- Manipulator.removeDataAttribute(element, styleProp);
- element.style[styleProp] = value;
- }
- });
- }
-
- _getScrollbarWidth() {
- // thx d.walsh
- const scrollDiv = document.createElement('div');
- scrollDiv.className = CLASS_NAME_SCROLLBAR_MEASURER;
- document.body.appendChild(scrollDiv);
- const scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth;
- document.body.removeChild(scrollDiv);
- return scrollbarWidth;
} // Static
static jQueryInterface(config, relatedTarget) {
return this.each(function () {
- let data = Data.get(this, DATA_KEY$6);
- const _config = { ...Default$5,
- ...Manipulator.getDataAttributes(this),
- ...(typeof config === 'object' && config ? config : {})
- };
+ const data = Modal.getInstance(this) || new Modal(this, typeof config === 'object' ? config : {});
- if (!data) {
- data = new Modal(this, _config);
+ if (typeof config !== 'string') {
+ return;
}
- if (typeof config === 'string') {
- if (typeof data[config] === 'undefined') {
- throw new TypeError(`No method named "${config}"`);
- }
-
- data[config](relatedTarget);
+ if (typeof data[config] === 'undefined') {
+ throw new TypeError(`No method named "${config}"`);
}
+
+ data[config](relatedTarget);
});
}
@@ -7686,7 +7797,7 @@
EventHandler.on(document, EVENT_CLICK_DATA_API$2, SELECTOR_DATA_TOGGLE$2, function (event) {
const target = getElementFromSelector(this);
- if (this.tagName === 'A' || this.tagName === 'AREA') {
+ if (['A', 'AREA'].includes(this.tagName)) {
event.preventDefault();
}
@@ -7702,15 +7813,7 @@
}
});
});
- let data = Data.get(target, DATA_KEY$6);
-
- if (!data) {
- const config = { ...Manipulator.getDataAttributes(target),
- ...Manipulator.getDataAttributes(this)
- };
- data = new Modal(target, config);
- }
-
+ const data = Modal.getInstance(target) || new Modal(target);
data.toggle(this);
});
/**
@@ -7724,69 +7827,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): util/scrollBar.js
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * --------------------------------------------------------------------------
- */
- const SELECTOR_FIXED_CONTENT = '.fixed-top, .fixed-bottom, .is-fixed';
- const SELECTOR_STICKY_CONTENT = '.sticky-top';
-
- const getWidth = () => {
- // https://developer.mozilla.org/en-US/docs/Web/API/Window/innerWidth#usage_notes
- const documentWidth = document.documentElement.clientWidth;
- return Math.abs(window.innerWidth - documentWidth);
- };
-
- const hide = (width = getWidth()) => {
- document.body.style.overflow = 'hidden';
-
- _setElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight', calculatedValue => calculatedValue + width);
-
- _setElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight', calculatedValue => calculatedValue - width);
-
- _setElementAttributes('body', 'paddingRight', calculatedValue => calculatedValue + width);
- };
-
- const _setElementAttributes = (selector, styleProp, callback) => {
- const scrollbarWidth = getWidth();
- SelectorEngine.find(selector).forEach(element => {
- if (element !== document.body && window.innerWidth > element.clientWidth + scrollbarWidth) {
- return;
- }
-
- const actualValue = element.style[styleProp];
- const calculatedValue = window.getComputedStyle(element)[styleProp];
- Manipulator.setDataAttribute(element, styleProp, actualValue);
- element.style[styleProp] = callback(Number.parseFloat(calculatedValue)) + 'px';
- });
- };
-
- const reset = () => {
- document.body.style.overflow = 'auto';
-
- _resetElementAttributes(SELECTOR_FIXED_CONTENT, 'paddingRight');
-
- _resetElementAttributes(SELECTOR_STICKY_CONTENT, 'marginRight');
-
- _resetElementAttributes('body', 'paddingRight');
- };
-
- const _resetElementAttributes = (selector, styleProp) => {
- SelectorEngine.find(selector).forEach(element => {
- const value = Manipulator.getDataAttribute(element, styleProp);
-
- if (typeof value === 'undefined' && element === document.body) {
- element.style.removeProperty(styleProp);
- } else {
- Manipulator.removeDataAttribute(element, styleProp);
- element.style[styleProp] = value;
- }
- });
- };
-
- /**
- * --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): offcanvas.js
+ * Bootstrap (v5.0.0): offcanvas.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -7812,11 +7853,8 @@
keyboard: 'boolean',
scroll: 'boolean'
};
- const CLASS_NAME_BACKDROP_BODY = 'offcanvas-backdrop';
const CLASS_NAME_SHOW$4 = 'show';
- const CLASS_NAME_TOGGLING = 'offcanvas-toggling';
const OPEN_SELECTOR = '.offcanvas.show';
- const ACTIVE_SELECTOR = `${OPEN_SELECTOR}, .${CLASS_NAME_TOGGLING}`;
const EVENT_SHOW$2 = `show${EVENT_KEY$5}`;
const EVENT_SHOWN$2 = `shown${EVENT_KEY$5}`;
const EVENT_HIDE$2 = `hide${EVENT_KEY$5}`;
@@ -7824,6 +7862,7 @@
const EVENT_FOCUSIN = `focusin${EVENT_KEY$5}`;
const EVENT_CLICK_DATA_API$1 = `click${EVENT_KEY$5}${DATA_API_KEY$2}`;
const EVENT_CLICK_DISMISS$1 = `click.dismiss${EVENT_KEY$5}`;
+ const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY$5}`;
const SELECTOR_DATA_DISMISS$1 = '[data-bs-dismiss="offcanvas"]';
const SELECTOR_DATA_TOGGLE$1 = '[data-bs-toggle="offcanvas"]';
/**
@@ -7837,6 +7876,7 @@
super(element);
this._config = this._getConfig(config);
this._isShown = false;
+ this._backdrop = this._initializeBackDrop();
this._addEventListeners();
} // Getters
@@ -7871,15 +7911,13 @@
this._isShown = true;
this._element.style.visibility = 'visible';
- if (this._config.backdrop) {
- document.body.classList.add(CLASS_NAME_BACKDROP_BODY);
- }
+ this._backdrop.show();
if (!this._config.scroll) {
hide();
- }
- this._element.classList.add(CLASS_NAME_TOGGLING);
+ this._enforceFocusOnElement(this._element);
+ }
this._element.removeAttribute('aria-hidden');
@@ -7890,16 +7928,14 @@
this._element.classList.add(CLASS_NAME_SHOW$4);
const completeCallBack = () => {
- this._element.classList.remove(CLASS_NAME_TOGGLING);
-
EventHandler.trigger(this._element, EVENT_SHOWN$2, {
relatedTarget
});
-
- this._enforceFocusOnElement(this._element);
};
- setTimeout(completeCallBack, getTransitionDurationFromElement(this._element));
+ const transitionDuration = getTransitionDurationFromElement(this._element);
+ EventHandler.one(this._element, 'transitionend', completeCallBack);
+ emulateTransitionEnd(this._element, transitionDuration);
}
hide() {
@@ -7913,8 +7949,6 @@
return;
}
- this._element.classList.add(CLASS_NAME_TOGGLING);
-
EventHandler.off(document, EVENT_FOCUSIN);
this._element.blur();
@@ -7923,6 +7957,8 @@
this._element.classList.remove(CLASS_NAME_SHOW$4);
+ this._backdrop.hide();
+
const completeCallback = () => {
this._element.setAttribute('aria-hidden', true);
@@ -7932,20 +7968,25 @@
this._element.style.visibility = 'hidden';
- if (this._config.backdrop) {
- document.body.classList.remove(CLASS_NAME_BACKDROP_BODY);
- }
-
if (!this._config.scroll) {
reset();
}
EventHandler.trigger(this._element, EVENT_HIDDEN$2);
-
- this._element.classList.remove(CLASS_NAME_TOGGLING);
};
- setTimeout(completeCallback, getTransitionDurationFromElement(this._element));
+ const transitionDuration = getTransitionDurationFromElement(this._element);
+ EventHandler.one(this._element, 'transitionend', completeCallback);
+ emulateTransitionEnd(this._element, transitionDuration);
+ }
+
+ dispose() {
+ this._backdrop.dispose();
+
+ super.dispose();
+ EventHandler.off(document, EVENT_FOCUSIN);
+ this._config = null;
+ this._backdrop = null;
} // Private
@@ -7958,6 +7999,15 @@
return config;
}
+ _initializeBackDrop() {
+ return new Backdrop({
+ isVisible: this._config.backdrop,
+ isAnimated: true,
+ rootElement: this._element.parentNode,
+ clickCallback: () => this.hide()
+ });
+ }
+
_enforceFocusOnElement(element) {
EventHandler.off(document, EVENT_FOCUSIN); // guard against infinite focus loop
@@ -7971,18 +8021,11 @@
_addEventListeners() {
EventHandler.on(this._element, EVENT_CLICK_DISMISS$1, SELECTOR_DATA_DISMISS$1, () => this.hide());
- EventHandler.on(document, 'keydown', event => {
+ EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS, event => {
if (this._config.keyboard && event.key === ESCAPE_KEY) {
this.hide();
}
});
- EventHandler.on(document, EVENT_CLICK_DATA_API$1, event => {
- const target = SelectorEngine.findOne(getSelectorFromElement(event.target));
-
- if (!this._element.contains(event.target) && target !== this._element) {
- this.hide();
- }
- });
} // Static
@@ -8028,10 +8071,10 @@
}
}); // avoid conflict when clicking a toggler of an offcanvas, while another is open
- const allReadyOpen = SelectorEngine.findOne(ACTIVE_SELECTOR);
+ const allReadyOpen = SelectorEngine.findOne(OPEN_SELECTOR);
if (allReadyOpen && allReadyOpen !== target) {
- return;
+ Offcanvas.getInstance(allReadyOpen).hide();
}
const data = Data.get(target, DATA_KEY$5) || new Offcanvas(target);
@@ -8050,7 +8093,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): util/sanitizer.js
+ * Bootstrap (v5.0.0): util/sanitizer.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -8163,7 +8206,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): tooltip.js
+ * Bootstrap (v5.0.0): tooltip.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -8338,7 +8381,6 @@
dispose() {
clearTimeout(this._timeout);
- EventHandler.off(this._element, this.constructor.EVENT_KEY);
EventHandler.off(this._element.closest(`.${CLASS_NAME_MODAL}`), 'hide.bs.modal', this._hideModalHandler);
if (this.tip && this.tip.parentNode) {
@@ -8423,7 +8465,7 @@
if ('ontouchstart' in document.documentElement) {
[].concat(...document.body.children).forEach(element => {
- EventHandler.on(element, 'mouseover', noop());
+ EventHandler.on(element, 'mouseover', noop);
});
}
@@ -8622,7 +8664,6 @@
modifiers: [{
name: 'flip',
options: {
- altBoundary: true,
fallbackPlacements: this.config.fallbackPlacements
}
}, {
@@ -8905,7 +8946,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): popover.js
+ * Bootstrap (v5.0.0): popover.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -9055,7 +9096,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): scrollspy.js
+ * Bootstrap (v5.0.0): scrollspy.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -9168,6 +9209,7 @@
_getConfig(config) {
config = { ...Default$1,
+ ...Manipulator.getDataAttributes(this._element),
...(typeof config === 'object' && config ? config : {})
};
@@ -9276,21 +9318,17 @@
static jQueryInterface(config) {
return this.each(function () {
- let data = Data.get(this, DATA_KEY$2);
-
- const _config = typeof config === 'object' && config;
+ const data = ScrollSpy.getInstance(this) || new ScrollSpy(this, typeof config === 'object' ? config : {});
- if (!data) {
- data = new ScrollSpy(this, _config);
+ if (typeof config !== 'string') {
+ return;
}
- if (typeof config === 'string') {
- if (typeof data[config] === 'undefined') {
- throw new TypeError(`No method named "${config}"`);
- }
-
- data[config]();
+ if (typeof data[config] === 'undefined') {
+ throw new TypeError(`No method named "${config}"`);
}
+
+ data[config]();
});
}
@@ -9303,7 +9341,7 @@
EventHandler.on(window, EVENT_LOAD_DATA_API, () => {
- SelectorEngine.find(SELECTOR_DATA_SPY).forEach(spy => new ScrollSpy(spy, Manipulator.getDataAttributes(spy)));
+ SelectorEngine.find(SELECTOR_DATA_SPY).forEach(spy => new ScrollSpy(spy));
});
/**
* ------------------------------------------------------------------------
@@ -9316,7 +9354,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): tab.js
+ * Bootstrap (v5.0.0): tab.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -9360,7 +9398,7 @@
show() {
- if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && this._element.classList.contains(CLASS_NAME_ACTIVE) || isDisabled(this._element)) {
+ if (this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && this._element.classList.contains(CLASS_NAME_ACTIVE)) {
return;
}
@@ -9448,11 +9486,17 @@
element.classList.add(CLASS_NAME_SHOW$1);
}
- if (element.parentNode && element.parentNode.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
+ let parent = element.parentNode;
+
+ if (parent && parent.nodeName === 'LI') {
+ parent = parent.parentNode;
+ }
+
+ if (parent && parent.classList.contains(CLASS_NAME_DROPDOWN_MENU)) {
const dropdownElement = element.closest(SELECTOR_DROPDOWN);
if (dropdownElement) {
- SelectorEngine.find(SELECTOR_DROPDOWN_TOGGLE).forEach(dropdown => dropdown.classList.add(CLASS_NAME_ACTIVE));
+ SelectorEngine.find(SELECTOR_DROPDOWN_TOGGLE, dropdownElement).forEach(dropdown => dropdown.classList.add(CLASS_NAME_ACTIVE));
}
element.setAttribute('aria-expanded', true);
@@ -9487,7 +9531,14 @@
EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (event) {
- event.preventDefault();
+ if (['A', 'AREA'].includes(this.tagName)) {
+ event.preventDefault();
+ }
+
+ if (isDisabled(this)) {
+ return;
+ }
+
const data = Data.get(this, DATA_KEY$1) || new Tab$1(this);
data.show();
});
@@ -9502,7 +9553,7 @@
/**
* --------------------------------------------------------------------------
- * Bootstrap (v5.0.0-beta3): toast.js
+ * Bootstrap (v5.0.0): toast.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* --------------------------------------------------------------------------
*/
@@ -9641,7 +9692,6 @@
this._element.classList.remove(CLASS_NAME_SHOW);
}
- EventHandler.off(this._element, EVENT_CLICK_DISMISS);
super.dispose();
this._config = null;
} // Private
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/tobago.js.map b/tobago-theme/tobago-theme-standard/src/main/js/tobago.js.map
index 968172a..cd7be64 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/tobago.js.map
+++ b/tobago-theme/tobago-theme-standard/src/main/js/tobago.js.map
@@ -1 +1 @@
-{"version":3,"file":"tobago.js","sources":["../ts/tobago-listener.ts","../ts/tobago-utils.ts","../ts/tobago-bar.ts","../ts/tobago-dropdown.ts","../../../../node_modules/vanillajs-datepicker/js/lib/utils.js","../../../../node_modules/vanillajs-datepicker/js/lib/date.js","../../../../node_modules/vanillajs-datepicker/js/lib/date-format.js","../../../../node_modules/vanillajs-datepicker/js/lib/event.js","../../../../node_modules/vanillajs-datepicker/js/i18n/base-locales.js","../../../../nod [...]
\ No newline at end of file
+{"version":3,"file":"tobago.js","sources":["../ts/tobago-listener.ts","../ts/tobago-utils.ts","../ts/tobago-bar.ts","../ts/tobago-dropdown.ts","../../../../node_modules/vanillajs-datepicker/js/lib/utils.js","../../../../node_modules/vanillajs-datepicker/js/lib/date.js","../../../../node_modules/vanillajs-datepicker/js/lib/date-format.js","../../../../node_modules/vanillajs-datepicker/js/lib/event.js","../../../../node_modules/vanillajs-datepicker/js/i18n/base-locales.js","../../../../nod [...]
\ No newline at end of file
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js b/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js
index c8fd08d..eb3166e 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js
+++ b/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js
@@ -1,8 +1,8 @@
-!function(e){"function"==typeof define&&define.amd?define(e):e()}((function(){"use strict";var e,t;!function(e){e[e.DOCUMENT_READY=0]="DOCUMENT_READY",e[e.WINDOW_LOAD=1]="WINDOW_LOAD",e[e.BEFORE_SUBMIT=2]="BEFORE_SUBMIT",e[e.AFTER_UPDATE=3]="AFTER_UPDATE",e[e.BEFORE_UNLOAD=4]="BEFORE_UNLOAD",e[e.BEFORE_EXIT=5]="BEFORE_EXIT"}(e||(e={})),function(e){e[e.EARLIER=0]="EARLIER",e[e.EARLY=1]="EARLY",e[e.NORMAL=2]="NORMAL",e[e.LATE=3]="LATE",e[e.LATER=4]="LATER"}(t||(t={}));class s{constructor() [...]
+!function(e){"function"==typeof define&&define.amd?define(e):e()}((function(){"use strict";var e,t;!function(e){e[e.DOCUMENT_READY=0]="DOCUMENT_READY",e[e.WINDOW_LOAD=1]="WINDOW_LOAD",e[e.BEFORE_SUBMIT=2]="BEFORE_SUBMIT",e[e.AFTER_UPDATE=3]="AFTER_UPDATE",e[e.BEFORE_UNLOAD=4]="BEFORE_UNLOAD",e[e.BEFORE_EXIT=5]="BEFORE_EXIT"}(e||(e={})),function(e){e[e.EARLIER=0]="EARLIER",e[e.EARLY=1]="EARLY",e[e.NORMAL=2]="NORMAL",e[e.LATE=3]="LATE",e[e.LATER=4]="LATER"}(t||(t={}));class s{constructor() [...]
/*!
- * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/)
+ * Bootstrap v5.0.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
-const Es="transitionend",Ss=e=>{do{e+=Math.floor(1e6*Math.random())}while(document.getElementById(e));return e},Ls=e=>{let t=e.getAttribute("data-bs-target");if(!t||"#"===t){let s=e.getAttribute("href");if(!s||!s.includes("#")&&!s.startsWith("."))return null;s.includes("#")&&!s.startsWith("#")&&(s="#"+s.split("#")[1]),t=s&&"#"!==s?s.trim():null}return t},xs=e=>{const t=Ls(e);return t&&document.querySelector(t)?t:null},ks=e=>{const t=Ls(e);return t?document.querySelector(t):null},As=e=>{i [...]
+const Es="transitionend",xs=e=>{do{e+=Math.floor(1e6*Math.random())}while(document.getElementById(e));return e},Ss=e=>{let t=e.getAttribute("data-bs-target");if(!t||"#"===t){let s=e.getAttribute("href");if(!s||!s.includes("#")&&!s.startsWith("."))return null;s.includes("#")&&!s.startsWith("#")&&(s=`#${s.split("#")[1]}`),t=s&&"#"!==s?s.trim():null}return t},Ls=e=>{const t=Ss(e);return t&&document.querySelector(t)?t:null},As=e=>{const t=Ss(e);return t?document.querySelector(t):null},ks=e=> [...]
//# sourceMappingURL=tobago.min.js.map
diff --git a/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js.map b/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js.map
index 42dfba6..413d436 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js.map
+++ b/tobago-theme/tobago-theme-standard/src/main/js/tobago.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"tobago.min.js","sources":["../ts/tobago-listener.ts","../ts/tobago-utils.ts","../ts/tobago-bar.ts","../ts/tobago-dropdown.ts","../../../../node_modules/vanillajs-datepicker/js/lib/utils.js","../../../../node_modules/vanillajs-datepicker/js/lib/date.js","../../../../node_modules/vanillajs-datepicker/js/lib/date-format.js","../../../../node_modules/vanillajs-datepicker/js/lib/event.js","../../../../node_modules/vanillajs-datepicker/js/i18n/base-locales.js","../../../.. [...]
\ No newline at end of file
+{"version":3,"file":"tobago.min.js","sources":["../ts/tobago-listener.ts","../ts/tobago-utils.ts","../ts/tobago-bar.ts","../ts/tobago-dropdown.ts","../../../../node_modules/vanillajs-datepicker/js/lib/utils.js","../../../../node_modules/vanillajs-datepicker/js/lib/date.js","../../../../node_modules/vanillajs-datepicker/js/lib/date-format.js","../../../../node_modules/vanillajs-datepicker/js/lib/event.js","../../../../node_modules/vanillajs-datepicker/js/i18n/base-locales.js","../../../.. [...]
\ No newline at end of file