diff --git a/app/javascript/vue/mixins/stackableHeadersMixin.js b/app/javascript/vue/mixins/stackableHeadersMixin.js index 38c3b9344..c9bbffe74 100644 --- a/app/javascript/vue/mixins/stackableHeadersMixin.js +++ b/app/javascript/vue/mixins/stackableHeadersMixin.js @@ -54,7 +54,6 @@ export default { this.secondaryNavigation.style.zIndex = 252; } else { this.secondaryNavigation.style.boxShadow = 'none'; - if (secondaryNavigationTop > 10) this.secondaryNavigation.style.zIndex = 11; } if (headerTop - 5 < this.taskSecondaryMenuHeight) { // When secondary navigation touch header diff --git a/app/javascript/vue/shared/isInViewPort.js b/app/javascript/vue/shared/isInViewPort.js index 334391102..fb14bc191 100644 --- a/app/javascript/vue/shared/isInViewPort.js +++ b/app/javascript/vue/shared/isInViewPort.js @@ -1,4 +1,4 @@ -export function isInViewPort(el) { +export default function isInViewPort(el) { const rect = el.getBoundingClientRect(); return ( @@ -6,9 +6,9 @@ export function isInViewPort(el) { rect.left >= 0 && rect.bottom <= (window.innerHeight || - document.documentElement.clientHeight) /*or $(window).height() */ && + document.documentElement.clientHeight) && rect.right <= (window.innerWidth || - document.documentElement.clientWidth) /*or $(window).width() */ + document.documentElement.clientWidth) ); } diff --git a/app/javascript/vue/shared/menu_dropdown.vue b/app/javascript/vue/shared/menu_dropdown.vue index 436bfba11..f3adf3c69 100644 --- a/app/javascript/vue/shared/menu_dropdown.vue +++ b/app/javascript/vue/shared/menu_dropdown.vue @@ -63,7 +63,7 @@