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

Fix scrolling when there are many txp s on OSX

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-12 11:58:53 -03:00
commit 0b5f323d11
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/views/includes/transaction.html
View file

@ -1,4 +1,4 @@
<div class="ng-animate-disabled row collapse last-transactions-content line-b"
<div class="row collapse last-transactions-content line-b"
ng-class="{'text-gray':!tx.pendingForUs}"
ng-click="home.openTxpModal(tx, index.copayers, !!index.glideraStatus)">
<div class="large-6 medium-6 small-6 columns size-14">
@ -7,19 +7,21 @@
<img src="img/icon-proposal.svg" alt="sync" width="40">
</div>
<div class="m10t">
<span ng-if="!tx.merchant">
{{index.addressbook[tx.toAddress]}}
<span ng-show="!index.addressbook[tx.toAddress] && tx.message">
<span class="ellipsis">{{tx.message}}</span>
<div ng-show="!tx.merchant">
<span ng-show="index.addressbook[tx.toAddress] && !tx.message">
{{index.addressbook[tx.toAddress]}}
</span>
<span ng-show="!index.addressbook[tx.toAddress] && !tx.message">
<span translate> Sending</span>
<span class="ellipsis" ng-show="!index.addressbook[tx.toAddress] && tx.message">
{{tx.message}}
</span>
</span>
<span ng-if="tx.merchant">
<span ng-show="!index.addressbook[tx.toAddress] && !tx.message" translate>
Sending
</span>
</div>
<div ng-show="tx.merchant">
<span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
<span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
</span>
</div>
</div>
</div>
<div class="large-5 medium-5 small-5 columns text-right">

16
public/views/walletHome.html
View file

@ -35,7 +35,8 @@
-->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
<ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;" on-drag-right="index.allowRefresher()" delegate-handle="my-handle">
<ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;"
on-drag-right="index.allowRefresher()" delegate-handle="my-handle" overflow-scroll="true">
<ion-refresher
ng-if="index.allowPullToRefresh && index.isCordova"
on-pulling="index.allowSideBar = false"
@ -86,7 +87,7 @@
</div>
</div> <!-- oh -->
<div class="m50b">
<div class="p60b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning">
<i class="fi-alert"></i>
@ -117,12 +118,11 @@
<span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i>
</div>
<div class="oh pr" ng-if="index.txps[0]">
<div ng-if="index.txps[0]">
<h4 ng-show="index.requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!index.requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div ng-repeat="tx in index.txps">
<div ng-include="index.txTemplateUrl">
</div>
<div ng-include="index.txTemplateUrl"></div>
</div>
<div class="text-gray text-center size-12 p10t"
@ -239,12 +239,6 @@
</div>
</div>
<div class="text-gray text-center size-12 p10t" ng-if="index.historyShowMore">
<span class="size-12" translate>{{index.completeHistory.length - index.txHistory.length}} more</span>
&nbsp;
<i class="icon-arrow-down4"></i>
</div>
<ion-infinite-scroll
ng-if="index.historyShowMore"
on-infinite="index.showMore()"

4
src/sass/main.scss
View file

@ -753,6 +753,10 @@ ul.manage li {
padding-top: 60px;
}
.p60b {
padding-bottom: 60px;
}
.m60t {
margin-top: 60px;
}