From 769c37ef012453ddb43de124dcfd48da749371b9 Mon Sep 17 00:00:00 2001
From: khk <khk@gmail.com>
Date: Mon, 16 Mar 2020 22:05:56 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=202?=
 =?UTF-8?q?=EC=B0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/clipboard.dialog.component.scss      |  1 +
 .../integrated-search.dialog.component.html   | 18 +++--
 .../integrated-search.dialog.component.scss   | 71 +++++++++++--------
 .../native/components/top-bar.component.ts    |  2 +
 4 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss
index 98059292..dd0bfda0 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss
@@ -7,6 +7,7 @@
 
     .mat-dialog-container {
       position: relative;
+      overflow: hidden;
     }
 
     .mat-card-header {
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
index 88858317..bd1bece3 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
@@ -12,7 +12,12 @@
     </button>
   </mat-card-header>
   <mat-card-content>
-    <div fxLayout="column" fxFlex="1 1 auto" class="rightDrawer-notice">
+    <div
+      fxLayout="column"
+      fxFlex="1 1 auto"
+      class="rightDrawer-notice"
+      style="position: relative;"
+    >
       <div class="search-area">
         <ucap-integrated-search-form
           [searchWord]="!!currentSearchWord ? currentSearchWord : ''"
@@ -160,11 +165,16 @@
               class="integrate-search-org detail-table"
             ></ucap-organization-detail-table>
           </div>
-          <div class="footer-fix search-result-footer">
+
+          <div
+            class="footer-fix search-result-footer"
+            fxFlex="auto"
+            fxLayout="column"
+          >
             <mat-accordion>
-              <mat-expansion-panel>
+              <mat-expansion-panel hideToggle>
                 <mat-expansion-panel-header>
-                  <mat-panel-title>
+                  <mat-panel-title class="select-user-title">
                     {{ 'organization.selectedUser' | translate }}
                     <span *ngIf="selectedUserList.length > 0">
                       ({{ selectedUserList.length }})
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 b30fa22a..c5a13820 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,16 +1,24 @@
-.mat-card-header {
-  .mat-card-header-text {
-    margin: 0;
+.confirm-card {
+  height: 100%;
+  .mat-card-header {
+    .mat-card-header-text {
+      margin: 0;
+    }
+    .btn-dialog-close {
+      font-size: 20px;
+      display: flex;
+      margin-left: auto;
+      align-self: flex-start;
+      color: #444444;
+    }
   }
-  .btn-dialog-close {
-    font-size: 20px;
+  .mat-card-content {
+    flex-direction: row;
+    box-sizing: border-box;
     display: flex;
-    margin-left: auto;
-    align-self: flex-start;
-    color: #444444;
+    height: 100%;
   }
 }
-
 ucap-integrated-search-form {
   position: relative;
   display: inline-flex;
@@ -26,33 +34,38 @@ ucap-integrated-search-form {
 .content-area {
   display: flex;
   height: calc(100% - 140px);
-}
-
-.contents-table {
-  position: relative;
+  flex-wrap: wrap;
   flex-direction: column;
+  flex: 0 0 auto;
   box-sizing: border-box;
-  display: flex;
-  flex: 1 1 100%;
-  max-width: 100%;
-  height: 100%;
-  overflow: hidden;
-  .table-box {
+  .contents-table {
     position: relative;
-    width: 100%;
-    height: calc(100% - 60px);
-    overflow: hidden;
-    display: flex;
-  }
-  .footer-fix {
-    display: flex;
-    flex: 1 1 auto;
-    bottom: 0;
-    width: 100%;
     flex-direction: column;
     box-sizing: border-box;
+    display: flex;
+    flex: 1 1 100%;
+    max-width: 100%;
+    height: 100%;
+    overflow: hidden;
+    .table-box {
+      position: relative;
+      width: 100%;
+      height: calc(100% - 60px);
+      overflow: hidden;
+      display: flex;
+    }
+    .footer-fix {
+      display: flex;
+      flex-wrap: wrap;
+      flex: 1 1 auto;
+      bottom: 0;
+      width: 100%;
+      flex-direction: column;
+      box-sizing: border-box;
+    }
   }
 }
+
 .btn-box {
   position: absolute;
   width: 100%;
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
index f2121ea9..be939132 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts
@@ -664,6 +664,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
         IntegratedSearchDialogData,
         IntegratedSearchDialogResult
       >(IntegratedSearchDialogComponent, {
+        height: '90vh',
+        width: '90vw',
         data: {
           keyword
         },