Merge branch 'master' into bugs/ui-07
This commit is contained in:
commit
11ab17ec94
13 changed files with 67 additions and 81 deletions
|
|
@ -39,7 +39,8 @@
|
|||
<div class="col2">
|
||||
<a class="size-12 wallet-item" ng-click="switchWallet(item.id)">
|
||||
<div class="oh">
|
||||
<div class="right size-10 type-wallet">[ {{item.totalCopayers}} of {{item.requiredCopayers}} ]</div>
|
||||
<div class="right size-10 type-wallet">
|
||||
[ {{item.requiredCopayers}} of {{item.totalCopayers}} ]</div>
|
||||
<div class="ellipsis name-wallet">{{item.name || item.id}}</div>
|
||||
</div>
|
||||
<div class="oh">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
</div>
|
||||
<div class="col2">
|
||||
<div class="oh m5t m10r">
|
||||
<div class="right size-10">[ {{$root.wallet.totalCopayers}} of {{$root.wallet.requiredCopayers}} ]</div>
|
||||
<div class="right size-10">[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]</div>
|
||||
<div class="name-wallet">
|
||||
<a ng-click="refresh()">
|
||||
<i class="fi-refresh right"></i>
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
<div class="col2">
|
||||
<a class="size-12 wallet-item" ng-click="switchWallet(item.id)">
|
||||
<div class="oh">
|
||||
<div class="right size-10 type-wallet">[ {{item.totalCopayers}} of {{item.requiredCopayers}} ]</div>
|
||||
<div class="right size-10 type-wallet">[ {{item.requiredCopayers}} of {{item.totalCopayers}} ]</div>
|
||||
<div class="ellipsis name-wallet">{{item.name || item.id}}</div>
|
||||
</div>
|
||||
<div class="oh">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue