From b38df8b452db48cb8a65244422cb4bdfed98e177 Mon Sep 17 00:00:00 2001 From: Mateus Machado Luna Date: Mon, 10 Feb 2020 17:16:44 -0300 Subject: [PATCH] Properly hides filter menu when advanced search is opeded; --- src/views/admin/pages/lists/items-page.vue | 2 ++ src/views/theme-search/pages/theme-items-page.vue | 2 ++ src/views/theme-search/scss/_layout.scss | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/admin/pages/lists/items-page.vue b/src/views/admin/pages/lists/items-page.vue index 4ed484a4c..ab50e3f17 100644 --- a/src/views/admin/pages/lists/items-page.vue +++ b/src/views/admin/pages/lists/items-page.vue @@ -723,8 +723,10 @@ if (newValue == false){ this.$eventBusSearch.$emit('closeAdvancedSearch'); this.advancedSearchResults = false; + this.isFiltersModalActive = true; } else { this.$eventBusSearch.clearAllFilters(); + this.isFiltersModalActive = false; } }, orderByName() { diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index a01b67d50..5f7b38da0 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -627,8 +627,10 @@ if (newValue == false){ this.$eventBusSearch.$emit('closeAdvancedSearch'); this.advancedSearchResults = false; + this.isFiltersModalActive = !this.startWithFiltersHidden; } else { this.$eventBusSearch.clearAllFilters(); + this.isFiltersModalActive = false; } }, orderByName() { diff --git a/src/views/theme-search/scss/_layout.scss b/src/views/theme-search/scss/_layout.scss index 8377f7c2f..6f1261585 100644 --- a/src/views/theme-search/scss/_layout.scss +++ b/src/views/theme-search/scss/_layout.scss @@ -55,7 +55,7 @@ z-index: 99999; float: left; max-width: 20%; - min-width: 180px; + min-width: 154px; min-height: 100%; width: auto; height: auto; @@ -91,9 +91,9 @@ } .items-list-area { - -webkit-flex: 0 1 auto; - -ms-flex: 0 1 auto; - flex: 0 1 auto; + -webkit-flex: 1 1 auto; + -ms-flex: 1 1 auto; + flex: 1 1 auto; min-height: 100%; }