From 1a67230dae76163fc7fb2fe85e7526e9129757c1 Mon Sep 17 00:00:00 2001
From: khk <khk@gmail.com>
Date: Tue, 17 Mar 2020 18:12:10 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=20-=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integrated-search.dialog.component.html   |  2 +-
 .../integrated-search.dialog.component.scss   |  3 ++
 .../components/detail-table.component.html    |  4 +-
 .../src/assets/scss/partials/_forms.scss      |  2 +-
 .../assets/scss/partials/_search-frame.scss   |  1 +
 .../integrated-search.component.scss          | 47 ++++++++++---------
 6 files changed, 33 insertions(+), 26 deletions(-)

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 c4759deb..0520ecc7 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
@@ -16,7 +16,7 @@
       fxLayout="column"
       fxFlex="1 1 auto"
       class="rightDrawer-notice"
-      style="position: relative;"
+      style="position: relative; width:100%"
     >
       <div class="search-area">
         <ucap-integrated-search-form
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 9f76953f..bb77edd2 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
@@ -112,3 +112,6 @@
     }
   }
 }
+.integrate-search-org {
+  overflow: auto;
+}
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
index ed6ac2f4..16af2d2e 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
@@ -151,7 +151,7 @@
         </div>
       </td>
     </ng-container>
-    <ng-container matColumnDef="checkable">
+    <ng-container matColumnDef="checkable" stickyEnd>
       <th mat-header-cell *matHeaderCellDef>
         <mat-checkbox
           #checkbox
@@ -161,7 +161,7 @@
         >
         </mat-checkbox>
       </th>
-      <td mat-cell *matCellDef="let element" minWidth="70">
+      <td mat-cell *matCellDef="let element" minWidth="70" >
         <mat-checkbox
           #checkbox
           *ngIf="loginRes.userSeq !== element.seq"
diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_forms.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_forms.scss
index e59b6ff1..ef6b3759 100644
--- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_forms.scss
+++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_forms.scss
@@ -82,7 +82,7 @@ textarea {
       .mat-form-field-infix {
         border: 0;
         padding: 0;
-        width: auto;
+        width: inherit !important;
         input {
           margin: 0;
           line-height: 1.4em;
diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss
index 45558f23..8766c222 100644
--- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss
+++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss
@@ -54,6 +54,7 @@ $search-font-size: 14px;
           .mat-form-field-infix {
             font-size: 14px;
             border: none;
+            width: inherit !important;
           }
           .mat-form-field-suffix {
             margin-left: auto;
diff --git a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss
index 8f9db9d7..d0230941 100644
--- a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss
+++ b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss
@@ -22,33 +22,36 @@
   user-select: none; /* Non-prefixed version, currently supported by Chrome and Opera */
 }
 
-.search-scrollbar {
-  height: 550px;
-}
-
-.search-area {
-  margin: 0 -10px;
-  .search-container {
-    display: flex;
-    flex-flow: row;
-    align-items: center;
-    width: 100%;
-    max-width: 100%;
-    .icon-img {
-      flex: 0 0 auto;
-      color: #777777;
-      transform: translateY(-4px);
-    }
-    .mat-form-field {
-      color: #333333;
-      font-size: 0.88rem;
-      color: #333333;
+.integrated-search {
+  width: 100%;
+  .search-area {
+    margin: 0 -10px;
+    .search-container {
+      display: flex;
+      flex-flow: row;
+      align-items: center;
       width: 100%;
-      margin-left: -20px;
+      max-width: 100%;
+      .icon-img {
+        flex: 0 0 auto;
+        color: #777777;
+        transform: translateY(-4px);
+      }
+      .mat-form-field {
+        color: #333333;
+        font-size: 0.88rem;
+        color: #333333;
+        width: 100%;
+        margin-left: -20px;
+      }
     }
   }
 }
 
+.search-scrollbar {
+  height: 550px;
+}
+
 .table-box {
   font-size: 13px;
   width: 100%;