You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2021/09/27 09:46:24 UTC
[myfaces-tobago] 02/02: build(theme): rebuild after update fix
dropdown menu
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 6fdb9b8db2ef05faff7b6e049072e7c3f11afd12
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Mon Sep 27 11:40:02 2021 +0200
build(theme): rebuild after update fix dropdown menu
---
.../src/main/css/tobago.css | 35 ++--------------------
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 35 ++--------------------
.../src/main/css/tobago.css.map | 2 +-
.../src/main/css/tobago.css | 35 ++--------------------
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-speyside/src/main/css/tobago.css | 35 ++--------------------
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-standard/src/main/css/tobago.css | 35 ++--------------------
.../src/main/css/tobago.css.map | 2 +-
.../tobago-theme-standard/src/main/js/tobago.js | 13 +++++---
.../src/main/js/tobago.js.map | 2 +-
.../src/main/js/tobago.min.js | 2 +-
.../src/main/js/tobago.min.js.map | 2 +-
14 files changed, 27 insertions(+), 177 deletions(-)
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 d681ed9..2091b96 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/css/tobago.css
@@ -12013,15 +12013,11 @@ tobago-out {
display: inline-block;
}
-.tobago-out-markup-strong {
- font-weight: bold;
-}
-
-.tobago-out-markup-deleted {
+.tobago-deleted {
text-decoration: line-through;
}
-.tobago-out-markup-number {
+.tobago-number {
display: block;
text-align: right;
}
@@ -12547,33 +12543,6 @@ tobago-sheet .table {
margin-bottom: 0;
}
-.tobago-sheet-cell-markup-right {
- text-align: right;
-}
-
-.tobago-sheet-cell-markup-center {
- text-align: center;
-}
-
-.tobago-sheet-cell-markup-justify {
- text-align: justify;
-}
-
-.tobago-sheet-cell-markup-filler {
- padding: 0 !important;
- /* fix for IE 11 */
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-middle {
- vertical-align: middle;
- line-height: initial;
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-bottom {
- vertical-align: bottom;
- line-height: initial;
-}
-
.tobago-sheet-footer {
text-align: center;
}
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 43b2d7b..b9e5e33 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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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 6393e77..dd1c1f1 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-roxborough/src/main/css/tobago.css
@@ -12036,15 +12036,11 @@ tobago-out {
display: inline-block;
}
-.tobago-out-markup-strong {
- font-weight: bold;
-}
-
-.tobago-out-markup-deleted {
+.tobago-deleted {
text-decoration: line-through;
}
-.tobago-out-markup-number {
+.tobago-number {
display: block;
text-align: right;
}
@@ -12570,33 +12566,6 @@ tobago-sheet .table {
margin-bottom: 0;
}
-.tobago-sheet-cell-markup-right {
- text-align: right;
-}
-
-.tobago-sheet-cell-markup-center {
- text-align: center;
-}
-
-.tobago-sheet-cell-markup-justify {
- text-align: justify;
-}
-
-.tobago-sheet-cell-markup-filler {
- padding: 0 !important;
- /* fix for IE 11 */
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-middle {
- vertical-align: middle;
- line-height: initial;
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-bottom {
- vertical-align: bottom;
- line-height: initial;
-}
-
.tobago-sheet-footer {
text-align: center;
}
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 ee780f3..941985e 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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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 f44290d..b859249 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-scarborough/src/main/css/tobago.css
@@ -12023,15 +12023,11 @@ tobago-out {
display: inline-block;
}
-.tobago-out-markup-strong {
- font-weight: bold;
-}
-
-.tobago-out-markup-deleted {
+.tobago-deleted {
text-decoration: line-through;
}
-.tobago-out-markup-number {
+.tobago-number {
display: block;
text-align: right;
}
@@ -12557,33 +12553,6 @@ tobago-sheet .table {
margin-bottom: 0;
}
-.tobago-sheet-cell-markup-right {
- text-align: right;
-}
-
-.tobago-sheet-cell-markup-center {
- text-align: center;
-}
-
-.tobago-sheet-cell-markup-justify {
- text-align: justify;
-}
-
-.tobago-sheet-cell-markup-filler {
- padding: 0 !important;
- /* fix for IE 11 */
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-middle {
- vertical-align: middle;
- line-height: initial;
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-bottom {
- vertical-align: bottom;
- line-height: initial;
-}
-
.tobago-sheet-footer {
text-align: center;
}
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 c52ae47..4ab35a6 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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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 71299dc..e2aaff6 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-speyside/src/main/css/tobago.css
@@ -11724,15 +11724,11 @@ tobago-out {
display: inline-block;
}
-.tobago-out-markup-strong {
- font-weight: bold;
-}
-
-.tobago-out-markup-deleted {
+.tobago-deleted {
text-decoration: line-through;
}
-.tobago-out-markup-number {
+.tobago-number {
display: block;
text-align: right;
}
@@ -12258,33 +12254,6 @@ tobago-sheet .table {
margin-bottom: 0;
}
-.tobago-sheet-cell-markup-right {
- text-align: right;
-}
-
-.tobago-sheet-cell-markup-center {
- text-align: center;
-}
-
-.tobago-sheet-cell-markup-justify {
- text-align: justify;
-}
-
-.tobago-sheet-cell-markup-filler {
- padding: 0 !important;
- /* fix for IE 11 */
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-middle {
- vertical-align: middle;
- line-height: initial;
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-bottom {
- vertical-align: bottom;
- line-height: initial;
-}
-
.tobago-sheet-footer {
text-align: center;
}
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 d2febb4..7b15a03 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 8179718..844db09 100644
--- a/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
+++ b/tobago-theme/tobago-theme-standard/src/main/css/tobago.css
@@ -11993,15 +11993,11 @@ tobago-out {
display: inline-block;
}
-.tobago-out-markup-strong {
- font-weight: bold;
-}
-
-.tobago-out-markup-deleted {
+.tobago-deleted {
text-decoration: line-through;
}
-.tobago-out-markup-number {
+.tobago-number {
display: block;
text-align: right;
}
@@ -12527,33 +12523,6 @@ tobago-sheet .table {
margin-bottom: 0;
}
-.tobago-sheet-cell-markup-right {
- text-align: right;
-}
-
-.tobago-sheet-cell-markup-center {
- text-align: center;
-}
-
-.tobago-sheet-cell-markup-justify {
- text-align: justify;
-}
-
-.tobago-sheet-cell-markup-filler {
- padding: 0 !important;
- /* fix for IE 11 */
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-middle {
- vertical-align: middle;
- line-height: initial;
-}
-
-.tobago-sheet-cell.tobago-sheet-cell-markup-bottom {
- vertical-align: bottom;
- line-height: initial;
-}
-
.tobago-sheet-footer {
text-align: center;
}
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 60b8979..7bfe56e 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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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/vendor/_rfs.scss","../../../../node_modules/bootstrap/scss/_variables.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 36a9f46..891897a 100644
--- a/tobago-theme/tobago-theme-standard/src/main/js/tobago.js
+++ b/tobago-theme/tobago-theme-standard/src/main/js/tobago.js
@@ -7522,20 +7522,25 @@
}
openDropdown() {
this.dispatchEvent(new CustomEvent(TobagoDropdownEvent.SHOW));
- if (!this.inStickyHeader()) {
+ if (!this.insideNavbar()) {
this.menuStore.appendChild(this.dropdownMenu);
}
this.dispatchEvent(new CustomEvent(TobagoDropdownEvent.SHOWN));
}
closeDropdown() {
this.dispatchEvent(new CustomEvent(TobagoDropdownEvent.HIDE));
- if (!this.inStickyHeader()) {
+ if (!this.insideNavbar()) {
this.appendChild(this.dropdownMenu);
}
this.dispatchEvent(new CustomEvent(TobagoDropdownEvent.HIDDEN));
}
- inStickyHeader() {
- return Boolean(this.closest("tobago-header.sticky-top"));
+ /**
+ * The bootstrap dropdown implementation doesn't adjust the position of the dropdown menu if inside a '.navbar'.
+ * In this case the dropdown menu should not be appended to the menu store.
+ * https://github.com/twbs/bootstrap/blob/0d81d3cbc14dfcdca8a868e3f25189a4f1ab273c/js/src/dropdown.js#L294
+ */
+ insideNavbar() {
+ return Boolean(this.closest(".navbar"));
}
get dropdownMenu() {
const root = this.getRootNode();
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 bce7050..8e666b9 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-utils.ts","../ts/tobago-bar.ts","../../../../node_modules/@popperjs/core/lib/enums.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getNodeName.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getWindow.js","../../../../node_modules/@popperjs/core/lib/dom-utils/instanceOf.js","../../../../node_modules/@popperjs/core/lib/modifiers/applyStyles.js","../../../../node_modules/@popperjs/core/lib/utils/getBasePlacement [...]
\ No newline at end of file
+{"version":3,"file":"tobago.js","sources":["../ts/tobago-utils.ts","../ts/tobago-bar.ts","../../../../node_modules/@popperjs/core/lib/enums.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getNodeName.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getWindow.js","../../../../node_modules/@popperjs/core/lib/dom-utils/instanceOf.js","../../../../node_modules/@popperjs/core/lib/modifiers/applyStyles.js","../../../../node_modules/@popperjs/core/lib/utils/getBasePlacement [...]
\ 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 0dbc1c6..d6e362f 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
@@ -4,5 +4,5 @@
* 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 Me="transitionend",Be=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},Re=e=>{const t=Be(e);return t&&document.querySelector(t)?t:null},je=e=>{const t=Be(e);return t?document.querySelector(t):null},He=e=>{e.dispatchEvent(new Event(Me))},qe=e=>!(!e||"object"!=typeof e)&&(void 0!==e.jquery&&( [...]
+const Me="transitionend",Be=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},Re=e=>{const t=Be(e);return t&&document.querySelector(t)?t:null},je=e=>{const t=Be(e);return t?document.querySelector(t):null},He=e=>{e.dispatchEvent(new Event(Me))},qe=e=>!(!e||"object"!=typeof e)&&(void 0!==e.jquery&&( [...]
//# 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 c4f295d..1f6fe3c 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-utils.ts","../ts/tobago-bar.ts","../../../../node_modules/@popperjs/core/lib/enums.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getNodeName.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getWindow.js","../../../../node_modules/@popperjs/core/lib/dom-utils/instanceOf.js","../../../../node_modules/@popperjs/core/lib/modifiers/applyStyles.js","../../../../node_modules/@popperjs/core/lib/utils/getBasePlace [...]
\ No newline at end of file
+{"version":3,"file":"tobago.min.js","sources":["../ts/tobago-utils.ts","../ts/tobago-bar.ts","../../../../node_modules/@popperjs/core/lib/enums.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getNodeName.js","../../../../node_modules/@popperjs/core/lib/dom-utils/getWindow.js","../../../../node_modules/@popperjs/core/lib/dom-utils/instanceOf.js","../../../../node_modules/@popperjs/core/lib/modifiers/applyStyles.js","../../../../node_modules/@popperjs/core/lib/utils/getBasePlace [...]
\ No newline at end of file