From f3c0a1d878791f70869f19203ccc8a2271644a8e Mon Sep 17 00:00:00 2001
From: khk <kanghk@biztechpartners.co.kr>
Date: Thu, 21 Nov 2019 14:54:25 +0900
Subject: [PATCH 1/2] =?UTF-8?q?setting-frame=20=EB=A0=88=EC=9D=B4=EC=95=84?=
 =?UTF-8?q?=EC=9B=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messenger-settings.dialog.component.html  | 48 ++++--------------
 .../messenger-settings.dialog.component.scss  | 49 ++++++++++++++++---
 2 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
index c03d6505..3bb09b57 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
@@ -1,16 +1,10 @@
-<mat-card class="confirm-card mat-elevation-z" fxFlexFill>
+<mat-card class="confirm-card mat-elevation-z setting-frame">
   <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
     <mat-card-title>설정</mat-card-title>
   </mat-card-header>
   <mat-card-content>
-    <div
-      fxLayout="column"
-      fxLayout.xs="column"
-      fxLayoutAlign="center"
-      fxLayoutGap="10px"
-      fxLayoutGap.xs="0"
-    >
-      <mat-tab-group flex="1" vertical animationDuration="0ms">
+    <div fxFlex class="setting-tab">
+      <mat-tab-group animationDuration="0ms" mat-stretch-tabs>
         <mat-tab>
           <ng-template mat-tab-label>
             <mat-icon>group</mat-icon>
@@ -42,51 +36,27 @@
       </mat-tab-group>
 
       <div class="left-side-tabs-body">
-        <div
-          #tabs
-          id="tabs-0"
-          class="left-side-tabs-contents"
-          style="display: block;"
-        >
+        <div #tabs id="tabs-0" class="left-side-tabs-contents" style="display: block;">
           ddddd
         </div>
-        <div
-          #tabs
-          id="tabs-1"
-          class="left-side-tabs-contents"
-          style="display: none;"
-        >
+        <div #tabs id="tabs-1" class="left-side-tabs-contents" style="display: none;">
           dddagadsfgadsf
         </div>
-        <div
-          #tabs
-          id="tabs-2"
-          class="left-side-tabs-contents"
-          style="display: none;"
-        >
+        <div #tabs id="tabs-2" class="left-side-tabs-contents" style="display: none;">
           fbkasfldsafkskdf
         </div>
-        <div
-          #tabs
-          id="tabs-3"
-          class="left-side-tabs-contents"
-          style="display: none;"
-        >
+        <div #tabs id="tabs-3" class="left-side-tabs-contents" style="display: none;">
           rgkdsfgkdfglkdsflgs
         </div>
       </div>
     </div>
   </mat-card-content>
   <mat-card-actions class="button-farm flex-row">
-    <button
-      mat-stroked-button
-      (click)="onClickChoice(false)"
-      class="mat-primary"
-    >
+    <button mat-stroked-button (click)="onClickChoice(false)" class="mat-primary">
       No
     </button>
     <button mat-flat-button (click)="onClickChoice(true)" class="mat-primary">
       Yes
     </button>
   </mat-card-actions>
-</mat-card>
+</mat-card>
\ No newline at end of file
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss
index dd668f95..4a66778e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.scss
@@ -1,30 +1,63 @@
+::ng-deep .cdk-overlay-pane{
+  width:600px;
+  max-height:90%;
+  .setting-frame{
+    .mat-dialog-container {
+      position: relative;
+    }
+  }
+}
 .confirm-card {
-  padding: 0px;
+  padding: 16px;
   min-width: 500px;
+  position: relative;
 
   .mat-card-header {
-    margin-bottom: 10px;
+    position: relative;
+    width: 100%;
+    margin-bottom: 12px;
     .mat-card-header-text {
       .mat-card-title {
-        margin: 0 -16px;
       }
     }
   }
 
   .mat-card-content {
-    flex: 1 1 auto;
+    flex: 0 0 auto;
     display: flex;
-
-    .content-box {
-      flex-direction: column;
-      flex-flow: column;
+    align-items: flex-start;
+    height: calc(100% - 100px);
+    .setting-tab {
+      width:100%;
+      height:100%;
+      position: relative;
+      .mat-tab-group {
+        width:100%;
+        height:100%;
+        position: relative;
+      }
     }
   }
 
   .button-farm {
     text-align: right;
+    position: relative;
+    width: 100%;
+    bottom: 10px;
     .mat-primary {
       margin-left: 4px;
     }
   }
 }
+
+::ng-deep .mat-tab-group {
+  .mat-tab-header{
+    margin-bottom:10px;
+    .mat-tab-labels{
+    border-bottom:2px solid #dddddd;
+    .mat-tab-label{
+      padding:0 10px;
+      }
+    }
+  }
+}
\ No newline at end of file

From 6dee2b58245ec37f207b9286b90304281aa10b9d Mon Sep 17 00:00:00 2001
From: khk <kanghk@biztechpartners.co.kr>
Date: Thu, 21 Nov 2019 15:00:19 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=A7=90=ED=92=8D=EC=84=A0-=20=20=EC=A4=84?=
 =?UTF-8?q?=EB=B0=94=EA=BF=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/lib/components/messages.component.scss                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5119e8ca..f62727ee 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
@@ -285,5 +285,5 @@ $meBox-bg: #ffffff;
 .bubble-main {
   word-wrap: break-word;
   white-space: pre-wrap;
-  word-break: keep-all;
+  word-break: break-word;
 }