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

Merge pull request #2918 from cmgustavo/bug/smooth-scrolling

Browse source 
Adds/Fixes smooth scroll on modals
This commit is contained in:
Matias Alejo Garcia 2015-06-26 17:40:22 -03:00
commit 4f8ccfe3b9
7 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
</section> </section>
</nav> </nav>
<div class="modal-content"> <div class="modal-content fix-modals-touch">
<ul class="no-bullet"> <ul class="no-bullet">
<li class="line-b p10" ng-repeat="copayer in copayers"> <li class="line-b p10" ng-repeat="copayer in copayers">
<span class="size-12" ng-show="copayer.id == copayerId"> <span class="size-12" ng-show="copayer.id == copayerId">

2
public/views/modals/customized-amount.html
View file

@ -11,7 +11,7 @@
</section> </section>
</nav> </nav>
<div class="modal-content"> <div class="modal-content fix-modals-touch">
<div class="m20b" ng-show="customizedAmountBtc"> <div class="m20b" ng-show="customizedAmountBtc">
<h4 class="title m0" translate>QR Code</h4> <h4 class="title m0" translate>QR Code</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">

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

@ -11,7 +11,7 @@
</section> </section>
</nav> </nav>
<div class="modal-content"> <div class="modal-content fix-modals-touch">
<div class="header-modal text-center"> <div class="header-modal text-center">
<div class="size-42"> <div class="size-42">
{{unitTotal}} {{unitName}} {{unitTotal}} {{unitName}}

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

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

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

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

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

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

5
src/css/mobile.css
View file

@ -12,6 +12,7 @@ body {
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
-webkit-touch-callout: none !important; -webkit-touch-callout: none !important;
-webkit-overflow-scrolling: touch;
} }
input { input {
@ -28,8 +29,8 @@ input {
-webkit-tap-highlight-color:rgba(0,0,0,0); -webkit-tap-highlight-color:rgba(0,0,0,0);
} }
.touch { .fix-modals-touch {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: auto;
} }
.enable_text_select { .enable_text_select {