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

bug fix

Browse Source 
profile popup close button added
This commit is contained in:
leejinho 2020-01-29 14:59:56 +09:00
parent 9bca5178b7
commit bb22a17baf
16 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

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

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

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

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

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

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

1
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html
View File

@ -17,5 +17,6 @@
(toggleBuddy)="onClickToggleBuddy($event)" (toggleBuddy)="onClickToggleBuddy($event)"
(uploadProfileImage)="onUploadProfileImage($event)" (uploadProfileImage)="onUploadProfileImage($event)"
(updateIntro)="onUpdateIntro($event)" (updateIntro)="onUpdateIntro($event)"
(close)="onClose($event)"
> >
</ucap-profile-profile> </ucap-profile-profile>

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts
View File

@ -463,4 +463,8 @@ export class ProfileDialogComponent implements OnInit, OnDestroy {
}) })
); );
} }
onClose() {
this.dialogRef.close();
}
} }

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }

4
projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html
View File

@ -384,4 +384,8 @@
</div> </div>
</mat-card-actions> </mat-card-actions>
</mat-card-content> </mat-card-content>
<button class="icon-button btn-dialog-close" (click)="onClose()">
<i class="mdi mdi-window-close"></i>
</button>
</mat-card> </mat-card>

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

@ -12,7 +12,7 @@
word-wrap: break-word; word-wrap: break-word;
} }
} }
::ng-deep .mat-card-header-text { .mat-card-header-text {
.mat-card-subtitle { .mat-card-subtitle {
color: rgb(256, 256, 256, 0.7) !important; color: rgb(256, 256, 256, 0.7) !important;
} }
@ -262,3 +262,8 @@
margin-left: 8px; margin-left: 8px;
} }
} }
.btn-dialog-close {
}

7
projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts
View File

@ -63,11 +63,12 @@ export class ProfileComponent implements OnInit {
userInfo: UserInfoSS; userInfo: UserInfoSS;
isBuddy: boolean; isBuddy: boolean;
}>(); }>();
@Output() @Output()
uploadProfileImage = new EventEmitter<FileUploadItem>(); uploadProfileImage = new EventEmitter<FileUploadItem>();
@Output() @Output()
updateIntro = new EventEmitter<string>(); updateIntro = new EventEmitter<string>();
@Output()
close = new EventEmitter();
@ViewChild('profileImageFileInput', { static: false }) @ViewChild('profileImageFileInput', { static: false })
profileImageFileInput: ElementRef<HTMLInputElement>; profileImageFileInput: ElementRef<HTMLInputElement>;
@ -250,4 +251,8 @@ export class ProfileComponent implements OnInit {
} }
return rtn; return rtn;
} }
onClose() {
this.close.emit();
}
} }

2
projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss
View File

@ -80,7 +80,7 @@ $thumbnail-msize: 40px;
display: flex; display: flex;
flex: 0 0 auto; flex: 0 0 auto;
margin: 0; margin: 0;
padding: 0; padding: 0 5px 0 0;
.room-info { .room-info {
flex-direction: column; flex-direction: column;

2
projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss
View File

@ -1,4 +1,4 @@
::ng-deep .mat-card-header { .mat-card-header {
.mat-card-header-text { .mat-card-header-text {
margin: 0; margin: 0;
} }