From bb22a17bafcc6d24028f624c7e4414022b07c890 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 29 Jan 2020 14:59:56 +0900 Subject: [PATCH] bug fix profile popup close button added --- .../dialogs/chat/create-chat.dialog.component.scss | 2 +- .../dialogs/chat/edit-chat-room.dialog.component.scss | 2 +- .../messenger/dialogs/chat/mass-detail.component.scss | 2 +- .../dialogs/group/edit-group.dialog.component.scss | 2 +- .../dialogs/group/select-group.dialog.component.scss | 2 +- .../dialogs/message/message-detail.dialog.component.scss | 2 +- .../dialogs/message/message-write.dialog.component.scss | 2 +- .../organization/selected-user-list.dialog.component.scss | 2 +- .../dialogs/profile/profile.dialog.component.html | 1 + .../messenger/dialogs/profile/profile.dialog.component.ts | 4 ++++ .../dialogs/search/integrated-search.dialog.component.scss | 2 +- .../src/lib/components/profile.component.html | 4 ++++ .../src/lib/components/profile.component.scss | 7 ++++++- .../src/lib/components/profile.component.ts | 7 ++++++- .../src/lib/components/list-item.component.scss | 2 +- .../src/lib/dialogs/confirm.dialog.component.scss | 2 +- 16 files changed, 32 insertions(+), 13 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss index d6715ffe..25101ef4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss index 455d6526..a2dabdf2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss index 106d6133..bc6e6b61 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss index 4386c317..03bff650 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss index 17fdde5f..3ae8119f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss index efd28023..1345d827 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss index f99c844a..c0573878 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss index 2d1cd97d..5c4d507a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html index afeedb1c..c5514923 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.html @@ -17,5 +17,6 @@ (toggleBuddy)="onClickToggleBuddy($event)" (uploadProfileImage)="onUploadProfileImage($event)" (updateIntro)="onUpdateIntro($event)" + (close)="onClose($event)" > diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts index cfa3e5a8..4f98cdc2 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/profile/profile.dialog.component.ts @@ -463,4 +463,8 @@ export class ProfileDialogComponent implements OnInit, OnDestroy { }) ); } + + onClose() { + this.dialogRef.close(); + } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss index a54b7c76..dc54373b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; } diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html index b462077e..0dc33777 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html @@ -384,4 +384,8 @@ + + diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss index dad02152..c8796a5d 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss @@ -12,7 +12,7 @@ word-wrap: break-word; } } -::ng-deep .mat-card-header-text { +.mat-card-header-text { .mat-card-subtitle { color: rgb(256, 256, 256, 0.7) !important; } @@ -262,3 +262,8 @@ margin-left: 8px; } } + + +.btn-dialog-close { + +} \ No newline at end of file diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts index 23876e54..72117a11 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.ts @@ -63,11 +63,12 @@ export class ProfileComponent implements OnInit { userInfo: UserInfoSS; isBuddy: boolean; }>(); - @Output() uploadProfileImage = new EventEmitter(); @Output() updateIntro = new EventEmitter(); + @Output() + close = new EventEmitter(); @ViewChild('profileImageFileInput', { static: false }) profileImageFileInput: ElementRef; @@ -250,4 +251,8 @@ export class ProfileComponent implements OnInit { } return rtn; } + + onClose() { + this.close.emit(); + } } diff --git a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss index a7282736..ea5431d0 100644 --- a/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-room/src/lib/components/list-item.component.scss @@ -80,7 +80,7 @@ $thumbnail-msize: 40px; display: flex; flex: 0 0 auto; margin: 0; - padding: 0; + padding: 0 5px 0 0; .room-info { flex-direction: column; diff --git a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss index 201ce5c0..0605ce89 100644 --- a/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/dialogs/confirm.dialog.component.scss @@ -1,4 +1,4 @@ -::ng-deep .mat-card-header { +.mat-card-header { .mat-card-header-text { margin: 0; }