From 4a48a9b2c4d0fd3470e636488baf64991eca23dc Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:08:27 +0530 Subject: [PATCH 1/3] bug fix 1263 --- src/app/core/services/http/http.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts index 5dceb788..765befb4 100644 --- a/src/app/core/services/http/http.service.ts +++ b/src/app/core/services/http/http.service.ts @@ -213,7 +213,7 @@ export class HttpService { break default: - this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') + // this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') } throw Error(result); } From c1c81de2f9ee246664abfe2c83888b156c1e1bb2 Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:52:10 +0530 Subject: [PATCH 2/3] BUg fix 1417 --- .../pages/home-search/home-search.page.html | 2 +- .../mentor-search-directory.page.html | 4 +-- .../mentor-search-directory.page.scss | 25 ++++++++++++++----- .../filter-tree/filter-tree.component.scss | 2 +- .../generic-search.component.html | 2 +- .../generic-search.component.scss | 24 ++++++++++++++---- 6 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html index f1758332..1fa3215a 100644 --- a/src/app/pages/home-search/home-search.page.html +++ b/src/app/pages/home-search/home-search.page.html @@ -7,7 +7,7 @@ - + - + @@ -79,7 +79,7 @@ {{totalCount}} {{"SEARCH_RESULT" | translate}} -
+
diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss b/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss index 08ff662c..031b3bfd 100644 --- a/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss +++ b/src/app/pages/mentor-search-directory/mentor-search-directory.page.scss @@ -90,15 +90,28 @@ display: flex; justify-content: space-between; } -.search-result-count{ - display: flex; - padding-left: 24%; -} .search-result-label{ display: flex; align-items: center; } .search-result-count{ display: flex; - padding-left: 24%; -} \ No newline at end of file + padding-left: 18%; +} +@media only screen and (max-width: 767px) { + .search-navigation { + display: flex; + flex-direction: column; + } + .search-result-count{ + display: flex; + padding-left: 11%; + } + .paginator { + order: 2; + display: -webkit-box; + } + .search-result { + order: 1; + } + } \ No newline at end of file diff --git a/src/app/shared/components/filter-tree/filter-tree.component.scss b/src/app/shared/components/filter-tree/filter-tree.component.scss index ea578937..c81b0b64 100644 --- a/src/app/shared/components/filter-tree/filter-tree.component.scss +++ b/src/app/shared/components/filter-tree/filter-tree.component.scss @@ -6,7 +6,7 @@ .wrapper-class { display: flex; justify-content: end; - padding: 5px 5px; + padding: 10px 20px 0px 0px; } .underline { cursor: pointer; diff --git a/src/app/shared/components/generic-search/generic-search.component.html b/src/app/shared/components/generic-search/generic-search.component.html index 28aed9f3..65db2337 100644 --- a/src/app/shared/components/generic-search/generic-search.component.html +++ b/src/app/shared/components/generic-search/generic-search.component.html @@ -10,7 +10,7 @@ {{totalCount}} {{"SEARCH_RESULT" | translate}} -
+
diff --git a/src/app/shared/components/generic-search/generic-search.component.scss b/src/app/shared/components/generic-search/generic-search.component.scss index eae6bd73..34f85af4 100644 --- a/src/app/shared/components/generic-search/generic-search.component.scss +++ b/src/app/shared/components/generic-search/generic-search.component.scss @@ -4,13 +4,27 @@ } .search-result-count{ display: flex; - padding-left: 24%; + padding-left: 18%; } .search-result-label{ display: flex; align-items: center; } -.search-result-count{ - display: flex; - padding-left: 24%; -} \ No newline at end of file + +@media only screen and (max-width: 767px) { + .search-navigation { + display: flex; + flex-direction: column; + } + .search-result-count{ + display: flex; + padding-left: 11%; + } + .paginator { + order: 2; + display: -webkit-box; + } + .search-result { + order: 1; + } + } \ No newline at end of file From 7159d6881217f5fb534fec45c6dd235daf800deb Mon Sep 17 00:00:00 2001 From: Rahul K R Date: Mon, 22 Jul 2024 10:53:42 +0530 Subject: [PATCH 3/3] uncomment the 1263 fix --- src/app/core/services/http/http.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/core/services/http/http.service.ts b/src/app/core/services/http/http.service.ts index 765befb4..5dceb788 100644 --- a/src/app/core/services/http/http.service.ts +++ b/src/app/core/services/http/http.service.ts @@ -213,7 +213,7 @@ export class HttpService { break default: - // this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') + this.toastService.showToast(msg ? msg : 'SOMETHING_WENT_WRONG', 'danger') } throw Error(result); }