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

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

Browse Source
This commit is contained in:
leejinho 2020-02-13 11:03:11 +09:00
commit f47ebc11d6
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
View File

@ -83,13 +83,15 @@
*ngFor="let groupBuddy of groupBuddyList$ | async"
[value]="groupBuddy.group"
[disabled]="getDisabled(groupBuddy)"
class="group-name"
class="group-list"
>
<div class="group-name">
<span class="title-name ellipsis"> {{ groupBuddy.group.name }} </span>
<span class="text-accent-color number"
>({{ groupBuddy.buddyList.length
}}{{ 'common.units.persons' | translate }})</span
>
</div>
</mat-list-option>
</mat-selection-list>
</mat-card-content>

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss
View File

@ -46,10 +46,10 @@
border-top: 1px solid #999999;
}
::ng-deep .group-name {
.group-list {
&.mat-list-item {
border-bottom: 1px solid #dddddd;
.mat-list-text {
.group-name {
flex-direction: row !important;
}
}

30
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
View File

@ -16,19 +16,21 @@
</button>
</mat-card-header>
<mat-card-content>
<mat-checkbox
#checkbox
labelPosition="before"
[checked]="
selectedUserList.length === data.selectedUserList.length &&
data.selectedUserList.length > 0
"
(change)="onCheckAllUser(checkbox.checked)"
(click)="$event.stopPropagation()"
class="check-all"
>
{{ 'common.messages.selectAll' | translate }}
</mat-checkbox>
<div class="check-all">
<mat-checkbox
#checkbox
labelPosition="before"
[checked]="
selectedUserList.length === data.selectedUserList.length &&
data.selectedUserList.length > 0
"
(change)="onCheckAllUser(checkbox.checked)"
(click)="$event.stopPropagation()"
class="checkbox"
>
{{ 'common.messages.selectAll' | translate }}
</mat-checkbox>
</div>
<div class="item-list">
<cdk-virtual-scroll-viewport
itemSize="60"
@ -61,7 +63,7 @@
</cdk-virtual-scroll-viewport>
</div>
</mat-card-content>
<mat-card-actions class="button-farm flex-row">
<mat-card-actions class="button-frame flex-row">
<button
mat-stroked-button
(click)="onClickChoice(false)"

7
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss
View File

@ -18,7 +18,7 @@
height: 450px;
}
}
.button-farm {
.button-frame {
text-align: right;
.mat-primary {
margin-left: 4px;
@ -26,11 +26,12 @@
}
}
::ng-deep .selected-user-dialog {
.selected-user-dialog {
.check-all {
display: flex;
border-bottom: 2px solid #444444;
.mat-checkbox-layout {
padding: 0 20px;
.checkbox {
margin-left: auto;
padding-bottom: 6px;
}

4
projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
View File

@ -166,6 +166,7 @@ $tablet-s-width: 768px;
}
}
//대화창 공통
::ng-deep .bubble {
.bubble-main {
word-wrap: break-word;
@ -184,7 +185,7 @@ $tablet-s-width: 768px;
}
}
::ng-deep .view-previous {
/*::ng-deep .view-previous {
display: flex;
flex-flow: column;
color: #ffffff;
@ -230,3 +231,4 @@ $tablet-s-width: 768px;
}
}
}
*/

7
projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
View File

@ -105,12 +105,7 @@ $tablet-l-width: 1024px;
}
}
.bubble-main {
word-wrap: break-word;
white-space: pre-wrap;
word-break: break-word;
}
::ng-deep .view-previous {
.view-previous {
display: flex;
flex-flow: column;
color: #ffffff;