대화방 전달 - 대화탭수정

This commit is contained in:
khk 2020-02-06 15:53:06 +09:00
parent 7308940001
commit 389997dee3
3 changed files with 25 additions and 24 deletions

View File

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

View File

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

View File

@ -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) { @media all and (max-width: 1400px) {
.slider { .slider {
&_content { &_content {