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

fix txps modal

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-12 12:39:22 -03:00
commit df03fc9112
3 changed files with 80 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/src/main.css
View file

@ -799,7 +799,7 @@ input[type=number]::-webkit-outer-spin-button {
background-color: #A02F23; background-color: #A02F23;
} }
.txp-popup .header { .header-modal {
background: #F3F5F6; background: #F3F5F6;
width: 100%; width: 100%;
padding: 0.8rem; padding: 0.8rem;

9
css/src/mobile.css
View file

@ -294,14 +294,5 @@
padding: 15px; padding: 15px;
} }
.button-popup {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: #F3F5F6;
padding: 1rem 0;
}
} }

25
views/modals/txp-details.html
View file

@ -1,5 +1,4 @@
<div class="txp-popup"> <div class="header-modal">
<div class="header">
<div ng-repeat="out in tx.outs"> <div ng-repeat="out in tx.outs">
<div class="ellipsis p10b size-16 m20r"> <div class="ellipsis p10b size-16 m20r">
<span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span> <span class="tx-proposal size-12 m5r"> <i ng-class="{'active':pendingForUs}" class="fi-arrow-right"></i> </span>
@ -23,9 +22,9 @@
</div> </div>
</div> </div>
<a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a> <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
</div> </div>
<div class="m10v line-b size-14" ng-show="tx.comment"> <div class="m10v line-b size-14" ng-show="tx.comment">
<div class="oh" ng-if="tx.ts || tx.createdTs "> <div class="oh" ng-if="tx.ts || tx.createdTs ">
<p class="left m5b">{{$root.iden.getName()}}</p> <p class="left m5b">{{$root.iden.getName()}}</p>
<div class="text-gray text-right m5t size-12"> <div class="text-gray text-right m5t size-12">
@ -35,9 +34,9 @@
<div class="text-gray m10b"> <div class="text-gray m10b">
{{tx.comment}} {{tx.comment}}
</div> </div>
</div> </div>
<div class="m10v line-b size-14" ng-if="tx.merchant"> <div class="m10v line-b size-14" ng-if="tx.merchant">
<div class="oh"> <div class="oh">
<p class="left m5b">Merchant Message:</p> <p class="left m5b">Merchant Message:</p>
<div class="text-gray text-right m5t size-12" ng-if="tx.merchant && tx.merchant.expirationDate"> <div class="text-gray text-right m5t size-12" ng-if="tx.merchant && tx.merchant.expirationDate">
@ -47,9 +46,9 @@
<div class="text-gray m10b"> <div class="text-gray m10b">
{{tx.merchant.pr.pd.memo}} {{tx.merchant.pr.pd.memo}}
</div> </div>
</div> </div>
<div ng-if="tx.actionList[0]" class="m10v"> <div ng-if="tx.actionList[0]" class="m10v">
<i>Signatures:</i> <i>Signatures:</i>
<ul class="tx-copayers m10t" ng-if="tx.actionList[0]"> <ul class="tx-copayers m10t" ng-if="tx.actionList[0]">
<li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}"> <li ng-repeat="c in tx.actionList" ng-class="{'bottom-line-copayers':!$last}">
@ -64,10 +63,9 @@
<span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span> <span>{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}}</span>
</li> </li>
</ul> </ul>
</div> </div>
</div>
<div class="box-notification" ng-show="error"> <div class="box-notification" ng-show="error">
<div class="box-icon error"> <div class="box-icon error">
<i class="fi-x size-24"></i> <i class="fi-x size-24"></i>
</div> </div>
@ -75,9 +73,9 @@
{{error}} {{error}}
</span> </span>
<a class="close-notification text-warning" ng-click="error=null">&#215;</a> <a class="close-notification text-warning" ng-click="error=null">&#215;</a>
</div> </div>
<div class="row button-popup" <div class="row"
ng-init="hideSign = false; hideReject = false" ng-init="hideSign = false; hideReject = false"
ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]"> ng-show="!tx.signedBy[$root.wallet.getMyCopayerId()] && !tx.rejectedBy[$root.wallet.getMyCopayerId()]">
<div class="large-6 medium-6 small-6 columns"> <div class="large-6 medium-6 small-6 columns">
@ -96,6 +94,5 @@
<span translate>Sign</span> <span translate>Sign</span>
</button> </button>
</div> </div>
</div>
</div> </div>