ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

통합검색 - 수정중

Browse Source
This commit is contained in:
khk 2020-03-17 18:12:10 +09:00
parent c884b0bf71
commit 1a67230dae
6 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
View File

@ -16,7 +16,7 @@
fxLayout="column" fxLayout="column"
fxFlex="1 1 auto" fxFlex="1 1 auto"
class="rightDrawer-notice" class="rightDrawer-notice"
style="position: relative;" style="position: relative; width:100%"
> >
<div class="search-area"> <div class="search-area">
<ucap-integrated-search-form <ucap-integrated-search-form

3
projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
View File

@ -112,3 +112,6 @@
} }
} }
} }
.integrate-search-org {
overflow: auto;
}

4
projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
View File

@ -151,7 +151,7 @@
</div> </div>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="checkable"> <ng-container matColumnDef="checkable" stickyEnd>
<th mat-header-cell *matHeaderCellDef> <th mat-header-cell *matHeaderCellDef>
<mat-checkbox <mat-checkbox
#checkbox #checkbox
@ -161,7 +161,7 @@
> >
</mat-checkbox> </mat-checkbox>
</th> </th>
<td mat-cell *matCellDef="let element" minWidth="70"> <td mat-cell *matCellDef="let element" minWidth="70" >
<mat-checkbox <mat-checkbox
#checkbox #checkbox
*ngIf="loginRes.userSeq !== element.seq" *ngIf="loginRes.userSeq !== element.seq"

2
projects/ucap-webmessenger-ui/src/assets/scss/partials/_forms.scss
View File

@ -82,7 +82,7 @@ textarea {
.mat-form-field-infix { .mat-form-field-infix {
border: 0; border: 0;
padding: 0; padding: 0;
width: auto; width: inherit !important;
input { input {
margin: 0; margin: 0;
line-height: 1.4em; line-height: 1.4em;

1
projects/ucap-webmessenger-ui/src/assets/scss/partials/_search-frame.scss
View File

@ -54,6 +54,7 @@ $search-font-size: 14px;
.mat-form-field-infix { .mat-form-field-infix {
font-size: 14px; font-size: 14px;
border: none; border: none;
width: inherit !important;
} }
.mat-form-field-suffix { .mat-form-field-suffix {
margin-left: auto; margin-left: auto;

13
projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.scss
View File

@ -22,11 +22,9 @@
user-select: none; /* Non-prefixed version, currently supported by Chrome and Opera */ user-select: none; /* Non-prefixed version, currently supported by Chrome and Opera */
} }
.search-scrollbar { .integrated-search {
height: 550px; width: 100%;
} .search-area {
.search-area {
margin: 0 -10px; margin: 0 -10px;
.search-container { .search-container {
display: flex; display: flex;
@ -47,6 +45,11 @@
margin-left: -20px; margin-left: -20px;
} }
} }
}
}
.search-scrollbar {
height: 550px;
} }
.table-box { .table-box {