From 6c0917f1691e6569500096bdad426a9a09cec9a1 Mon Sep 17 00:00:00 2001
From: khk <khk@gmail.com>
Date: Wed, 12 Feb 2020 18:45:43 +0900
Subject: [PATCH] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(5?=
 =?UTF-8?q?=EC=B0=A8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/select-group.dialog.component.html  |  4 ++-
 .../group/select-group.dialog.component.scss  |  4 +--
 .../selected-user-list.dialog.component.html  | 30 ++++++++++---------
 .../selected-user-list.dialog.component.scss  |  7 +++--
 .../lib/components/message-box.component.scss |  4 ++-
 .../lib/components/messages.component.scss    |  7 +----
 6 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
index 52539aec..501e1a78 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html
@@ -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>
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 9df6fb4e..7ebb03e8 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
@@ -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;
     }
   }
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
index 711d4939..a51adb34 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
@@ -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)"
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 9259c312..995eb1da 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
@@ -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;
     }
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
index 226ccc32..65fdc328 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
@@ -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;
     }
   }
 }
+*/
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
index 1d375809..bb8127d0 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.scss
@@ -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;