Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html

@@ -146,15 +146,11 @@
           </mat-tab>
           <mat-tab>
             <ng-template mat-tab-label>
-              <!--<mat-icon
-                matTooltip="{{ 'organization.chart' | translate }}"
-                matTooltipPosition="after"
-                >device_hub</mat-icon>-->
               <button class="icon-button">
                 <i class="mid mid-24 mdi-file-tree"></i>
               </button>
             </ng-template>
-            <div class="dialog-tab-orglist">
+            <div class="mat-tab-frame dialog-tab-orglist">
               <app-layout-chat-left-sidenav-organization
                 [showTitle]="false"
                 [selectedUserList]="selectedUserList"
@@ -178,7 +174,7 @@
                 ><i class="mid mid-24 mdi-chat"></i>
               </mat-icon>
             </ng-template>
-            <div>
+            <div class="mat-tab-frame dialog-tab-chatlist">
               <ucap-room-list-item
                 *ngFor="let room of roomList"
                 [loginRes]="loginRes"
@@ -190,6 +186,7 @@
                 [multiCheckable]="false"
                 (checkRoom)="onCheckRoom($event)"
                 (click)="onToggleRoom(room)"
+                class="chat"
               >
               </ucap-room-list-item>
             </div>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss

@@ -8,6 +8,12 @@
       color: #444444;
     }
   }
+  & > .mat-card-content {
+    height: 568px;
+  }
+  & > .mat-tab-body-wrapper {
+    height: calc(100% - 50px);
+  }
 }
 
 .dialog-tab-grouplist {
@@ -27,6 +33,14 @@
   }
 }
 
+.dialog-tab-chatlist {
+  height: 518px;
+  width: 100%;
+  .chat {
+    width: 100%;
+  }
+}
+
 ::ng-deep .dialog-tab-orglist {
   width: 100%;
   height: 380px;
@@ -102,10 +116,8 @@
   }
 }
 
-/*::ng-deep .mat-dialog-container {
+:ng-deep .mat-dialog-container {
   .mat-tab-body-wrapper {
-    height: 380px;
-    width: 100%;
     .mat-tab-body {
       width: 100%;
       height: 100%;
@@ -116,7 +128,12 @@
     }
   }
 }
-
+::ng-deep .ps-content {
+  .cdk-virtual-scroll-viewport {
+    height: 100%;
+  }
+}
+/*:
 .mat-tab-frame {
   width: 100%;
   height: 100%;
@@ -133,11 +150,7 @@
 ::ng-deep .mat-card > .mat-tab-labels {
   border-bottom: 2px solid #dddddd;
 }
-::ng-deep .ps-content {
+
-  .cdk-virtual-scroll-viewport {
-    height: 100%;
-  }
-}
 
 .list-item-frame {
   width: 100%;

projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss

@@ -327,15 +327,6 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86);
   }
 }
 
-.mat-card-content {
-  .notice {
-    p {
-      line-height: 1.4em;
-      margin-bottom: 10px;
-    }
-  }
-}
-
 @media all and (max-width: 1400px) {
   .slider {
     &_content {