BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3491 from bitpay/revert-3490-bug/history-sync-02 

Revert "fix style on history sync"
This commit is contained in:
Matias Alejo Garcia 2015-11-19 11:03:47 -03:00
parent ca6621125a d9e58c541d
commit f49c48cd64
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
public/views/walletHome.html
View File

@ -316,7 +316,7 @@
<div class="addressbook-input" ng-show="!sendForm.address.$invalid && _address">
{{index.addressbook[_address] || _address}}
</div>
<a class="postfix size-12 m0 text-gray"
<a class="postfix size-12 m0 text-gray"
ng-click="openDestinationAddressModal(index.otherWallets, _address)">
<i class="icon-wallet size-18"></i>
</a>
@ -450,29 +450,23 @@
</div>
</div>
<div class="row m20t text-center" ng-show="index.updatingTxHistory[index.walletId]">
<div ng-show="index.txProgress > 6">
<div class="circle-icon">
<img src="/img/icon-sync.svg" alt="sync" width="70">
</div>
<div translate class="size-12 text-gray m20t small-10 small-centered columns">
Initial transaction history synchronization can take some minutes for wallets with many transactions.
<b> Please stand by.</b>
</div>
<div class="small-8 small-centered columns line-b p10 m20b"></div>
<div class="columns large-12 medium-12 small-12 m10b">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>
</div>
</div>
<div class="size-14 text-gray m20t">
<b>{{index.txProgress}}</b> <br>
<span translate>Transactions Downloaded</span>
<div class="columns large-12 medium-12 small-12">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>
</div>
</div>
<div ng-show="index.txProgress > 6" translate class="size-12 text-gray m20t">
Initial transaction history synchronization can take some minutes for wallets with many transactions.</br>
Please stand by.
</div>
<div ng-show="index.txProgress > 6" class="size-14 text-gray m20t">
<b>{{index.txProgress}}</b>
<span translate>Transactions<br> Downloaded</span>
</div>
</div>
<div ng-show="index.txHistory[0]">
@ -514,7 +508,7 @@
<div class="size-14 text-gray columns m5t" ng-if="btx.message || btx.addressTo">
<div ng-show="btx.message">{{btx.message}}</div>
<div ng-show="!btx.message">
<span translate>To</span>: {{index.addressbook[btx.addressTo] || btx.addressTo}}
{{index.addressbook[btx.addressTo] || btx.addressTo}}
</div>
</div>
</div>
@ -530,7 +524,7 @@
</div>
</div>
</div>
<div class="row m20t">
<div class="large-6 medium-6 small-6 columns">
<button type="submit" class="button black round expand" ng-show="index.historyShowShowAll" ng-click="index.showAllHistory()" ng-style="{'background-color':index.backgroundColor}" translate>

9
src/css/main.css
View File

@ -359,15 +359,6 @@ ul.tx-copayers {
background-color: #C0392B;
}
.circle-icon {
background: #F1F3F5;
border-radius: 100%;
padding: 1.5rem;
width: 80px;
height: 80px;
margin: 0 auto;
}
.date-message {
background-color: #213140;
border-radius: 3px;