ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
병준 박 2019-11-06 13:48:20 +09:00
commit bc38d47c14
2 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.html
View File

@ -48,7 +48,7 @@
</form>
</div>
</div>
</div>
<div *ngIf="!isSearch" class="app-layout-chat-left-sidenav-chat-list">
<perfect-scrollbar fxFlex="1 1 auto">
<ucap-room-list-item
@ -61,6 +61,7 @@
(contextmenu)="onContextMenuChat($event, room)"
>
</ucap-room-list-item>
</perfect-scrollbar>
<!-- <cdk-virtual-scroll-viewport
itemSize="20"
class="app-layout-chat-left-sidenav-chat-list-viewport"
@ -76,9 +77,9 @@
>
</ucap-room-list-item>
</cdk-virtual-scroll-viewport> -->
</perfect-scrollbar>
</div>
<div *ngIf="!!isSearch" class="app-layout-chat-left-sidenav-chat-list search">
<perfect-scrollbar fxFlex="1 1 auto">
<ucap-room-list-item
*ngFor="let room of searchRoomList"
[loginRes]="loginRes"
@ -89,6 +90,7 @@
(contextmenu)="onContextMenuChat($event, room)"
>
</ucap-room-list-item>
</perfect-scrollbar>
<!-- <cdk-virtual-scroll-viewport
itemSize="20"
class="app-layout-chat-left-sidenav-chat-list-viewport"
@ -130,4 +132,3 @@
</button>
</ng-template>
</mat-menu>
</div>

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss
View File

@ -70,7 +70,7 @@
}
.app-layout-chat-left-sidenav-chat-list {
height: calc(100% - 60px);
height: calc(100% - 120px);
}
.app-layout-chat-left-sidenav-chat-list-viewport {