From 21ab506b3bafd3390c820be698057659c776b268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Kr=C3=B3l?= Date: Thu, 29 Mar 2018 17:10:05 +0200 Subject: [PATCH 001/183] Update search.js --- core/lib/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/search.js b/core/lib/search.js index 8440510bb4..11f4efc85e 100644 --- a/core/lib/search.js +++ b/core/lib/search.js @@ -57,14 +57,14 @@ function _handleEsResult (resp, start = 0, size = 50) { * @param {Int} size page size * @return {Promise} */ -export function quickSearchByQuery ({ query, start = 0, size = 50, entityType = 'product', sort = '' }) { +export function quickSearchByQuery ({ query, start = 0, size = 50, entityType = 'product', sort = '', index = null }) { size = parseInt(size) if (size <= 0) size = 50 if (start < 0) start = 0 return new Promise((resolve, reject) => { const esQuery = { - index: config.elasticsearch.index, // TODO: add grouped prodduct and bundled product support + index: index || config.elasticsearch.index, // TODO: add grouped prodduct and bundled product support type: entityType, body: query, size: size, From 945c8fee9aa65028104d97dee0e1041308b29806 Mon Sep 17 00:00:00 2001 From: Irene Date: Fri, 30 Mar 2018 11:10:11 +0200 Subject: [PATCH 002/183] #934 Mobile side menu minor fixes --- .../components/core/blocks/SidebarMenu/SidebarMenu.vue | 4 ++++ .../default/components/core/blocks/SidebarMenu/SubBtn.vue | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue index aa1f754dad..ab4eb93055 100644 --- a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue +++ b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue @@ -213,6 +213,10 @@ ul { z-index: 3; transition: transform $duration-main $motion-main; + @media (max-width: 767px) { + width: 100vh; + } + &.active { transform: translateX(0); } diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubBtn.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubBtn.vue index b63ea28276..7916a1d08d 100644 --- a/src/themes/default/components/core/blocks/SidebarMenu/SubBtn.vue +++ b/src/themes/default/components/core/blocks/SidebarMenu/SubBtn.vue @@ -10,7 +10,7 @@ keyboard_arrow_right -
-
+