diff --git a/cookbook/static/themes/tandoor.min.css b/cookbook/static/themes/tandoor.min.css index 261c798ef..9dc091af6 100644 --- a/cookbook/static/themes/tandoor.min.css +++ b/cookbook/static/themes/tandoor.min.css @@ -10440,13 +10440,13 @@ footer a:hover { background-color: transparent !important; } -textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([class="select2-search__field"]), select { +textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([class="select2-search__field"]):not([class="vue-treeselect__input"]), select { background-color: white !important; border-radius: .25rem !important; border: 1px solid #ced4da !important; } -.multiselect__tag, .multiselect__option--highlight, .multiselect__option--highlight:after { +.multiselect__tag, .multiselect__option--highlight, .multiselect__option--highlight:after, .vue-treeselect__multi-value-item { background-color: #cfd5cd !important; color: #212529 !important; } @@ -10455,7 +10455,7 @@ textarea, input:not([type="submit"]):not([class="multiselect__input"]):not([clas background-color: #a7240e !important; } -.multiselect__tag-icon:after { +.multiselect__tag-icon:after, .vue-treeselect__icon vue-treeselect__value-remove, .vue-treeselect__value-remove { color: #212529 !important } diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 9babcef94..bc088bc70 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -356,7 +356,7 @@ export default { this.settings.search_keywords = [] for (let x of urlParams.getAll('keyword')) { let keyword = {id: x, name: 'loading'} - this.settings.search_keywords.push(keyword) + this.settings.search_keywords.push(keyword.id) apiClient.retrieveKeyword(x).then(result => { this.$set(this.settings.search_keywords, this.settings.search_keywords.indexOf(keyword), result.data) }) diff --git a/vue/src/components/GenericMultiselect.vue b/vue/src/components/GenericMultiselect.vue index 4085ed7b8..943c61737 100644 --- a/vue/src/components/GenericMultiselect.vue +++ b/vue/src/components/GenericMultiselect.vue @@ -69,7 +69,7 @@ export default { this.objects = this.sticky_options.concat(result.data.results) }) } else { - apiClient[this.search_function]({query: {query: query, limit: 10}}).then(result => { + apiClient[this.search_function]({query: {query: query, limit: this.limit}}).then(result => { this.objects = this.sticky_options.concat(result.data) }) }