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

Merge branch 'master' of http://10.81.13.221:6990/Web/next-ucap-messenger

Browse Source
This commit is contained in:
leejinho 2019-11-22 16:15:17 +09:00
commit 8c6731b2e8
5 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html
View File

@ -85,6 +85,34 @@
</div> </div>
</ng-template> </ng-template>
</mat-tab> </mat-tab>
<mat-tab [aria-label]="MainMenu.Message">
<ng-template mat-tab-label>
<!--<mat-icon>device_hub</mat-icon>-->
<div
class="icon-item"
matTooltip="Organization"
matTooltipPosition="after"
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="#000000"
stroke-width="1.5"
stroke-linecap="butt"
stroke-linejoin="bevel"
>
<polygon
points="21.368 12.001 3 21.609 3 14 11 12 3 9.794 3 2.394"
/>
</svg>
</div>
</ng-template>
</mat-tab>
<mat-tab [aria-label]="MainMenu.Call"> <mat-tab [aria-label]="MainMenu.Call">
<ng-template mat-tab-label> <ng-template mat-tab-label>
<!--<mat-icon>phone</mat-icon>--> <!--<mat-icon>phone</mat-icon>-->
@ -158,6 +186,14 @@
id="tabs-3" id="tabs-3"
class="left-side-tabs-contents" class="left-side-tabs-contents"
style="display: none;" style="display: none;"
>
<!--<app-layout-chat-left-sidenav-message></app-layout-chat-left-sidenav-message>-->
</div>
<div
#tabs
id="tabs-4"
class="left-side-tabs-contents"
style="display: none;"
> >
<app-layout-chat-left-sidenav-call></app-layout-chat-left-sidenav-call> <app-layout-chat-left-sidenav-call></app-layout-chat-left-sidenav-call>
</div> </div>

10
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.html
View File

@ -92,11 +92,17 @@
<span>새 그룹 추가</span> <span>새 그룹 추가</span>
</button> </button>
<button mat-menu-item (click)="onClickGroupMenu('GROUP_EXPAND_MORE')"> <button mat-menu-item (click)="onClickGroupMenu('GROUP_EXPAND_MORE')">
<mat-icon>expand_more</mat-icon> <!--<mat-icon>expand_more</mat-icon>-->
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round">
<path d="M6 9l6 6 6-6" /></svg>
<span>그룹 전체 열기</span> <span>그룹 전체 열기</span>
</button> </button>
<button mat-menu-item (click)="onClickGroupMenu('GROUP_EXPAND_LESS')"> <button mat-menu-item (click)="onClickGroupMenu('GROUP_EXPAND_LESS')">
<mat-icon>expand_less</mat-icon> <!--<mat-icon>expand_less</mat-icon>-->
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor"
stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="round">
<path d="M18 15l-6-6-6 6" /></svg>
<span>그룹 전체 닫기</span> <span>그룹 전체 닫기</span>
</button> </button>
<!-- <button mat-menu-item (click)="onClickGroupMenu('GROUP_SAVE')"> <!-- <button mat-menu-item (click)="onClickGroupMenu('GROUP_SAVE')">

4
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html
View File

@ -40,9 +40,9 @@
</div> </div>
<ul> <ul>
<li class="name">{{ selectedFile.info.name }}</li> <li class="name">{{ selectedFile.info.name }}</li>
<li>size : {{ selectedFile.info.size | ucapBytes }}</li> <li><span class="text-accent-color">size :</span> {{ selectedFile.info.size | ucapBytes }}</li>
<li> <li>
date : <span class="text-accent-color">date :</span>
{{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }}
</li> </li>
</ul> </ul>

2
projects/ucap-webmessenger-app/src/assets/scss/global/_default.scss
View File

@ -215,7 +215,7 @@ $daesang-grey: (
color: mat-color($accent); color: mat-color($accent);
} }
.text-warn-color { .text-warn-color {
color: mat-color($warn); color: mat-color($warn, 800);
} }
.border-primary-color { .border-primary-color {
border: 1px solid mat-color($primary); border: 1px solid mat-color($primary);

6
projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html
View File

@ -61,9 +61,9 @@
type="submit" type="submit"
aria-label="Send message" aria-label="Send message"
> >
<i class="material-icons"> <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor"
send stroke-width="2" stroke-linecap="butt" stroke-linejoin="round">
</i> <path d="M12 19V6M5 12l7-7 7 7" /></svg>
</button> </button>
</form> </form>
</div> </div>