diff --git a/src/admin/components/lists/processes-list.vue b/src/admin/components/lists/processes-list.vue index 93f8a753e..f7957bdad 100644 --- a/src/admin/components/lists/processes-list.vue +++ b/src/admin/components/lists/processes-list.vue @@ -472,23 +472,27 @@ } }, created(){ - jQuery( document ).on( 'heartbeat-tick-list', ( event, data ) => { - let updatedProcesses = data.bg_process_feedback; + if (jQuery && jQuery( document )) { + jQuery( document ).on( 'heartbeat-tick-list', ( event, data ) => { + let updatedProcesses = data.bg_process_feedback; - for (let updatedProcess of updatedProcesses) { - let updatedProcessIndex = this.processes.findIndex((aProcess) => aProcess.ID == updatedProcess.ID); - if (updatedProcessIndex >= 0) { - this.heartBitUpdateProcess(updatedProcess); + for (let updatedProcess of updatedProcesses) { + let updatedProcessIndex = this.processes.findIndex((aProcess) => aProcess.ID == updatedProcess.ID); + if (updatedProcessIndex >= 0) { + this.heartBitUpdateProcess(updatedProcess); + } } - } - }); + }); - jQuery( document ).on( 'heartbeat-tick', ( event, data ) => { - jQuery( document ).trigger('heartbeat-tick-list', data); - }); + jQuery( document ).on( 'heartbeat-tick', ( event, data ) => { + jQuery( document ).trigger('heartbeat-tick-list', data); + }); + } }, beforeDestroy() { - jQuery( document ).unbind( 'heartbeat-tick-list') + if (jQuery && jQuery( document )) { + jQuery( document ).unbind( 'heartbeat-tick-list') + } } } diff --git a/src/admin/components/other/processes-popup.vue b/src/admin/components/other/processes-popup.vue index 776cd17f4..8bcb7004c 100644 --- a/src/admin/components/other/processes-popup.vue +++ b/src/admin/components/other/processes-popup.vue @@ -236,18 +236,19 @@ export default { this.showProcessesList = false; - jQuery( document ).on( 'heartbeat-tick-popup', ( event, data ) => { - this.setProcesses(data.bg_process_feedback); - }); - - jQuery( document ).on( 'heartbeat-tick', ( event, data ) => { - jQuery( document ).trigger('heartbeat-tick-popup',data); - }); - + if (jQuery && jQuery( document )) { + jQuery( document ).on( 'heartbeat-tick-popup', ( event, data ) => { + this.setProcesses(data.bg_process_feedback); + }); + jQuery( document ).on( 'heartbeat-tick', ( event, data ) => { + jQuery( document ).trigger('heartbeat-tick-popup',data); + }); + } }, beforeDestroy() { - jQuery( document ).unbind( 'heartbeat-tick-popup') + if (jQuery && jQuery( document )) + jQuery( document ).unbind( 'heartbeat-tick-popup') } } diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js index dfe113ee7..e13e27840 100644 --- a/src/admin/js/theme-main.js +++ b/src/admin/js/theme-main.js @@ -118,7 +118,8 @@ function listen(evnt, elem, func) { return r; } else { - jQuery('head').append(''); + if (jQuery && jQuery('head')) + jQuery('head').append(''); } } listen("load", window, function() { diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index 14d063813..3eca5d6dd 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -1524,7 +1524,9 @@ this.$nextTick(() => { if (this.$refs['search-control'] != undefined) this.searchControlHeight = this.$refs['search-control'] ? this.$refs['search-control'].clientHeight + this.$refs['search-control'].offsetTop : 0; - this.isFiltersMenuCompressed = jQuery(window).width() <= 768; + + if (jQuery && jQuery(window)) + this.isFiltersMenuCompressed = jQuery(window).width() <= 768; }); }, 500), removeEventListeners() { @@ -1773,7 +1775,6 @@ .filters-menu { position: relative; z-index: 10; - background-color: white; width: $filter-menu-width; min-width: 180px; min-height: 100%; diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue index e305b54c5..b14278301 100644 --- a/src/admin/pages/lists/term-items-page.vue +++ b/src/admin/pages/lists/term-items-page.vue @@ -1447,9 +1447,11 @@ }, adjustSearchControlHeight: _.debounce( function() { this.$nextTick(() => { - if (this.$refs['search-control'] != undefined) + if (this.$refs['search-control'] != undefined) this.searchControlHeight = this.$refs['search-control'] ? this.$refs['search-control'].clientHeight + this.$refs['search-control'].offsetTop : 0; - this.isFiltersMenuCompressed = jQuery(window).width() <= 768; + + if (jQuery && jQuery(window)) + this.isFiltersMenuCompressed = jQuery(window).width() <= 768; }); }, 500), removeEventListeners() { @@ -1688,7 +1690,6 @@ .filters-menu { position: relative; z-index: 10; - background-color: white; width: $filter-menu-width; min-width: 180px; min-height: 100%; diff --git a/src/admin/scss/_buttons.scss b/src/admin/scss/_buttons.scss index b9cb723b3..a810ae69b 100644 --- a/src/admin/scss/_buttons.scss +++ b/src/admin/scss/_buttons.scss @@ -37,8 +37,8 @@ button.link-style:active { &.is-success:hover, &.is-success:focus { background: $success !important; } - &.is-white:hover, &.is-white:focus, &.is-outlined:hover, &.is-outlined:focus { - background: $white !important; + &.is-white, &.is-white:hover, &.is-white:focus, &.is-outlined:hover, &.is-outlined:focus { + background-color: transparent !important; } &:active { -webkit-transform: none !important; @@ -68,7 +68,8 @@ button.link-style:active { background-color: white !important; } &.is-white[disabled] { - background-color: white !important; + background-color: transparent !important; + opacity: 0.85; } } .button.is-small { diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss index da7fc8363..f3fad31a5 100644 --- a/src/admin/scss/_dropdown-and-autocomplete.scss +++ b/src/admin/scss/_dropdown-and-autocomplete.scss @@ -114,7 +114,7 @@ .taginput-container { padding: 0px !important; - background-color: white !important; + background-color: transparent !important; &:focus, &:active { border: none !important; diff --git a/src/admin/scss/_filters-menu-modal.scss b/src/admin/scss/_filters-menu-modal.scss index 345c8e356..dde251090 100644 --- a/src/admin/scss/_filters-menu-modal.scss +++ b/src/admin/scss/_filters-menu-modal.scss @@ -1,4 +1,5 @@ -#filters-mobile-modal { +#filters-mobile-modal { + background-color: white; .modal-close { right: calc(8.3333333% + 20px); diff --git a/src/admin/scss/_view-mode-cards.scss b/src/admin/scss/_view-mode-cards.scss index c6a221ee8..125f40937 100644 --- a/src/admin/scss/_view-mode-cards.scss +++ b/src/admin/scss/_view-mode-cards.scss @@ -136,6 +136,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + margin-top: 0; margin-bottom: 0; } } diff --git a/src/admin/scss/_view-mode-masonry.scss b/src/admin/scss/_view-mode-masonry.scss index 5e83e7360..10d6bcc10 100644 --- a/src/admin/scss/_view-mode-masonry.scss +++ b/src/admin/scss/_view-mode-masonry.scss @@ -113,6 +113,7 @@ text-align: left !important; margin-bottom: 0 !important; word-break: break-word; + margin: 0; } } diff --git a/src/admin/scss/_view-mode-records.scss b/src/admin/scss/_view-mode-records.scss index 954c91480..a4a5f4e98 100644 --- a/src/admin/scss/_view-mode-records.scss +++ b/src/admin/scss/_view-mode-records.scss @@ -109,6 +109,7 @@ text-overflow: ellipsis; white-space: nowrap; overflow: hidden; + margin: 0; transition: background-color 0.3s; } } diff --git a/src/theme-helper/view-mode-masonry.vue b/src/theme-helper/view-mode-masonry.vue index 411fc9edf..cc0374a4f 100644 --- a/src/theme-helper/view-mode-masonry.vue +++ b/src/theme-helper/view-mode-masonry.vue @@ -86,7 +86,8 @@ export default { this.$refs.masonryWrapper.children[0] != undefined && this.$refs.masonryWrapper.children[0].children[0] != undefined && this.$refs.masonryWrapper.children[0].children[0].clientWidth != undefined) { - this.containerWidthDiscount = jQuery(window).width() - this.$refs.masonryWrapper.clientWidth; + if (jQuery && jQuery(window)) + this.containerWidthDiscount = jQuery(window).width() - this.$refs.masonryWrapper.clientWidth; } this.$forceUpdate(); }, diff --git a/src/theme-helper/view-mode-records.vue b/src/theme-helper/view-mode-records.vue index 62a1ef12b..bd680807b 100644 --- a/src/theme-helper/view-mode-records.vue +++ b/src/theme-helper/view-mode-records.vue @@ -169,7 +169,8 @@ export default { this.$refs.masonryWrapper.children[0] != undefined && this.$refs.masonryWrapper.children[0].children[0] != undefined && this.$refs.masonryWrapper.children[0].children[0].clientWidth != undefined) { - this.containerWidthDiscount = jQuery(window).width() - this.$refs.masonryWrapper.clientWidth; + if (jQuery && jQuery(window)) + this.containerWidthDiscount = jQuery(window).width() - this.$refs.masonryWrapper.clientWidth; } this.$forceUpdate(); }, 500)