Merge pull request #527 from rahulramakrishnan3/release-3.0.0

bug fix 1263
ELEVATE-Project · Jul 22, 2024 · ca361c6 · ca361c6
2 parents 8dc889b + 7159d68
commit ca361c6
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 16 deletions.
diff --git a/src/app/pages/home-search/home-search.page.html b/src/app/pages/home-search/home-search.page.html
@@ -7,7 +7,7 @@
     </ion-searchbar>
   </div>
 </app-page-header>
-<ion-toolbar class="padding-top-10">
+<ion-toolbar>
   <ng-template
   cdkConnectedOverlay
   [cdkConnectedOverlayOrigin]="trigger"

diff --git a/src/app/pages/mentor-search-directory/mentor-search-directory.page.html b/src/app/pages/mentor-search-directory/mentor-search-directory.page.html
@@ -29,7 +29,7 @@
     </div>
   </ion-grid>
 </ng-template>
-<ion-toolbar class="padding-top-10">
+<ion-toolbar>
   <ion-grid>
     <ion-row>
       <ion-col size="auto" *ngIf="showSelectedCriteria">
@@ -79,7 +79,7 @@
         <ion-label>{{totalCount}} {{"SEARCH_RESULT" | translate}}</ion-label>
       </div>
     </div>
-    <div>
+    <div class="paginator">
       <mat-paginator  [length]="totalCount" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions" (page)="onPageChange($event)"></mat-paginator>
     </div>
   </div>

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
@@ -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%;
-}
+    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;
+    }
+  }
diff --git 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
@@ -10,7 +10,7 @@
       <ion-label>{{totalCount}} {{"SEARCH_RESULT" | translate}}</ion-label>
     </div>
   </div>
-  <div>
+  <div class="paginator">
     <mat-paginator  [length]="totalCount" [pageSize]="limit" [pageSizeOptions]="pageSizeOptions" (page)="onPageChange($event)"></mat-paginator>
   </div>
 </div>

diff --git 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%;
-}
+
+@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;
+    }
+  }