mirror of https://github.com/BTCPrivate/copay.git
fix conflict
This commit is contained in:
parent
9c2fcdfd04
commit
a30fc703af
|
@ -92,7 +92,7 @@ header .alt-currency {
|
|||
.alt-currency {
|
||||
padding: 0.05rem 0.2rem;
|
||||
border-radius: 2px;
|
||||
font-size: 11px;
|
||||
font-size: 10px;
|
||||
color: #fff;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
<div class="row" ng-repeat="out in tx.outs">
|
||||
<div class="large-3 medium-3 small-4 columns">
|
||||
<div class="size-12">
|
||||
<span>{{out.value}} {{$root.wallet.settings.unitName}}</span>
|
||||
<span class="label secondary round">
|
||||
<b>{{out.value}} {{$root.wallet.settings.unitName}}</b>
|
||||
<span class="alt-currency gray">
|
||||
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
|
||||
</span>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue