overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
insanity 2018-04-25 20:27:06 +09:00
parent c4265fdefc
commit f73d4c3c14
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/commons/component/layout/notification/app.notification.component.html
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<div class="ui-g-12 ui-bottom-border-1"> <div class="ui-g-12 ui-bottom-border-1">
Notifications Notifications
</div> </div>
@ -14,20 +13,3 @@
<span>View All</span> <span>View All</span>
</a> </a>
</li> </li>
=======
<div class="ui-g ui-g-12 ui-g-nopad ui-app-noti">
<h4>No tifications</h4>
<li role="menuitem" *ngFor="let noti of notifications; let i = index">
<a *ngIf="i < 5" href="javascript:void(0)" class="topbar-message" (click)="onNotiClick(noti)" [ngStyle]="noti.confirmDate ? '' : {'background-color': 'lightblue'}">
<div class="ui-app-noti-date">{{noti.createDate | date: 'short'}}</div>
<div class="ui-app-noti-title">{{noti.title}}</div>
<div class="ui-app-noti-content">{{noti.message}}</div>
</a>
</li>
<li>
<a href="javascript:void(0)" (click)="onViewAllClick(noti)">
<span>View All</span>
</a>
</li>
</div>
>>>>>>> c5e1b49b5336780bfe65a1db9a07a5643f2881c0