Issue #SH-31 merge: Merge pull request #1112 from balakrishna10/relea…

…se-3.1.0 Issue #SH-31 feat: activity details css fixes
Sunbird-Ed · Jul 16, 2020 · e488749 · e488749
2 parents 5e80cf0 + 438604c
commit e488749
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 32 deletions.
diff --git a/src/app/my-groups/activity-details/activity-details.page.scss b/src/app/my-groups/activity-details/activity-details.page.scss
@@ -27,6 +27,7 @@
 }
 .ad-mebers-container{
     box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25);
+    min-height: calc(100vh - 215px);
 }
 .ad-empty-result{
     img{

diff --git a/src/app/my-groups/group-details/group-details.page.html b/src/app/my-groups/group-details/group-details.page.html
@@ -38,39 +38,41 @@
           <input type="text" [(ngModel)]="searchMember" placeholder="{{'GROUP_MEMBER_SEARCH_PLACEHOLDER' | translate}}"
             (ngModelChange)="onMemberSearch(searchMember)">
         </div>
-        <div class="gd-add-member-container">
-          <div *ngIf="loggedinUser?.role === 'admin'" class="gd-add-member" (click)="navigateToAddUserPage()">
-            <span class="gd-add-member-icon">
-              <img src="assets/imgs/ic_person_add_white.svg">
-            </span>
-            <span class="gd-large-text">
-              {{'ADD_MEMBER' | translate}}
-            </span>
-          </div>
-        </div>
-        <div *ngIf="isGroupLoading">
-          <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
-            <sb-member-card [isLoading]="true"
-              [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"></sb-member-card>
+        <div class="gd-tab-member-container">
+          <div class="gd-add-member-container">
+            <div *ngIf="loggedinUser?.role === 'admin'" class="gd-add-member" (click)="navigateToAddUserPage()">
+              <span class="gd-add-member-icon">
+                <img src="assets/imgs/ic_person_add_white.svg">
+              </span>
+              <span class="gd-large-text">
+                {{'ADD_MEMBER' | translate}}
+              </span>
+            </div>
           </div>
-        </div>
-        <div *ngIf="!isGroupLoading">
-          <div *ngFor="let member of filteredMemberList; let i = index">
-            <sb-member-card [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
-              [identifier]="member.userId" [indexOfMember]="i" [initial]="commonUtilService.extractInitial(member.name)"
-              [title]="getMemberName(member)" [isMenu]="showMemberMenu(member)" [isAdmin]="member.role === 'admin'"
-              (menuClick)="memberMenuClick($event, member)">
-            </sb-member-card>
+          <div *ngIf="isGroupLoading">
+            <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
+              <sb-member-card [isLoading]="true"
+                [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"></sb-member-card>
+            </div>
           </div>
-        </div>
-        <div *ngIf="(!isGroupLoading && !filteredMemberList) || (!isGroupLoading && filteredMemberList.length <= 1)"
-          class="text-center">
-          <div class="gd-empty-result" *ngIf="!memberSearchQuery">
-            <img src="assets/imgs/no_member.svg" alt="">
+          <div *ngIf="!isGroupLoading">
+            <div *ngFor="let member of filteredMemberList; let i = index">
+              <sb-member-card [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
+                [identifier]="member.userId" [indexOfMember]="i" [initial]="commonUtilService.extractInitial(member.name)"
+                [title]="getMemberName(member)" [isMenu]="showMemberMenu(member)" [isAdmin]="member.role === 'admin'"
+                (menuClick)="memberMenuClick($event, member)">
+              </sb-member-card>
+            </div>
           </div>
-          <div class="gd-empty-result" *ngIf="memberSearchQuery && !filteredMemberList.length">
-            <img src="assets/imgs/empty_search_result.svg" alt="">
-            <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
+          <div *ngIf="(!isGroupLoading && !filteredMemberList) || (!isGroupLoading && filteredMemberList.length <= 1)"
+            class="text-center">
+            <div class="gd-empty-result" *ngIf="!memberSearchQuery">
+              <img src="assets/imgs/no_member.svg" alt="">
+            </div>
+            <div class="gd-empty-result" *ngIf="memberSearchQuery && !filteredMemberList.length">
+              <img src="assets/imgs/empty_search_result.svg" alt="">
+              <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
+            </div>
           </div>
         </div>
       </div>

diff --git a/src/app/my-groups/group-details/group-details.page.scss b/src/app/my-groups/group-details/group-details.page.scss
@@ -83,8 +83,9 @@
         }
     }
 }
-.gd-add-member-container{
+.gd-tab-member-container{
     box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25);
+    min-height: calc(100vh - 225px);
 }
 
 .gd-member-search {
@@ -147,7 +148,8 @@
 .gd-add-member {
     border-bottom: 1px solid $gray-100;
     margin-bottom: 16px;
-    padding: 16px 8px;
+    margin: 0 8px;
+    padding: 16px 0;
 }
 
 .gd-add-member-icon {