anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

add rejected styling

Browse source
This commit is contained in:
Marty Alcala 2016-10-11 19:00:16 -04:00
commit 7451aa0e8f
2 changed files with 22 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/sass/views/includes/txp-details.scss
View file

@ -184,6 +184,14 @@
font-weight: 600;
vertical-align: middle;
color: #09C286;
&.rejected {
background: #E15061;
border-color: #E15061;
color: #FFFFFF;
font-family: "Roboto-Bold";
font-size: 19px;
}
}
}

51
www/views/modals/txp-details.html
View file

@ -84,7 +84,7 @@
<div class="item single-line">
<span class="label" translate>Created by</span>
<span class="item-note">
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
{{tx.creatorName}} <time>{{ (tx.ts || tx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
</span>
</div>
<div class="item" ng-show="tx.message">
@ -131,45 +131,22 @@
</div>
<div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index">
<!-- <div class="row">
<div class="col col-10 timeline-icon">
<div>{{$index + 1}}</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList | orderBy: 'time' track by $index">
<div class="timeline-content">
<div class="timeline-content__icon">
<div class="rejected" ng-if="a.type === 'reject'">!</div>
<div ng-if="a.type !== 'reject'">{{$index + 1}}</div>
</div>
<div class="col timeline-content">
<div class="timeline-content__label">
<div class="action">{{a.description}}</div>
<div class="name">{{a.by}}</div>
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'HH:mm a'}}</time>
</span>
</div>
<div class="timeline-content__label">
<div class="action">{{a.description}}</div>
<div class="name">{{a.by}}</div>
</div>
</div> -->
<!-- <div class="row">
<div class="col col-10 timeline-icon">
<div>{{$index + 1}}</div>
</div> -->
<div class="timeline-content">
<div class="timeline-content__icon">
<div>{{$index + 1}}</div>
</div>
<div class="timeline-content__label">
<div class="action">{{a.description}}</div>
<div class="name">{{a.by}}</div>
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'HH:mm a'}}</time>
</span>
</div>
<div>
<span class="item-note">
<time>{{ a.time * 1000 | amDateFormat:'hh:mm a'}}</time>
</span>
</div>
<!-- </div> -->
</div>
</div>
</div>
</div>