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

Merge pull request #2793 from cmgustavo/bug/modal-scroll-topbar

Browse source 
Bug/modal scroll topbar
This commit is contained in:
Matias Alejo Garcia 2015-05-29 19:36:44 -03:00
commit 57fc80350f
6 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
public/views/modals/copayers.html
View file

@ -12,14 +12,17 @@
</section>
</nav>
<ul class="no-bullet p45t">
<li class="line-b p10" ng-repeat="copayer in copayers">
<span class="size-12" ng-show="copayer.id == copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
</span>
<span class="size-12 text-gray" ng-show="copayer.id != copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
</span>
</li>
</ul>
<div class="modal-content">
<ul class="no-bullet">
<li class="line-b p10" ng-repeat="copayer in copayers">
<span class="size-12" ng-show="copayer.id == copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
</span>
<span class="size-12 text-gray" ng-show="copayer.id != copayerId">
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
</span>
</li>
</ul>
<div class="extra-margin-bottom"></div>
</div>

5
public/views/modals/paypro.html
View file

@ -11,7 +11,7 @@
</section>
</nav>
<div class="p45t">
<div class="modal-content">
<div class="header-modal text-center">
<div class="size-42">
{{unitTotal}} {{unitName}}
@ -48,7 +48,6 @@
<span class="right">{{paypro.expires * 1000 | amTimeAgo }}</span>
</li>
</ul>
<div class="extra-margin-bottom"></div>
</div>
<div class="extra-margin-bottom"></div>

2
public/views/modals/scanner.html
View file

@ -10,7 +10,7 @@
</h1>
</section>
</nav>
<div class="p60t text-center" ng-init="init()">
<div class="modal-content text-center" ng-init="init()">
<canvas id="qr-canvas" width="200" height="150"></canvas>
<video id="qrcode-scanner-video" width="300" height="225"></video>
</div>

4
public/views/modals/tx-details.html
View file

@ -12,7 +12,7 @@
</section>
</nav>
<div class="p45t">
<div class="modal-content">
<div class="header-modal text-center">
<div class="size-42">
<span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} {{settings.unitName}}
@ -89,5 +89,5 @@
</div>
</div>
<div class="extra-margin-bottom"></div>
</div>
<div class="extra-margin-bottom"></div>

4
public/views/modals/txp-details.html
View file

@ -11,7 +11,7 @@
</h1>
</section>
</nav>
<div class="p45t" ng-init="updateCopayerList()">
<div class="modal-content" ng-init="updateCopayerList()">
<h4 class="title m0" translate>Details</h4>
<ul class="no-bullet size-14 m0">
<li class="line-b p10 oh" ng-click="copyAddress(tx.toAddress)">
@ -143,5 +143,5 @@
</button>
</div>
<div class="extra-margin-bottom"></div>
</div>
<div class="extra-margin-bottom"></div>