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

send/receive iPhoneX fixes

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-07-30 09:37:14 +02:00
commit 3732d21728
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/js/controllers/walletDetails.js
View file

@ -327,16 +327,16 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
} }
scrollPos = scrollPos || 0; scrollPos = scrollPos || 0;
var amountHeight = 230 - scrollPos; var amountHeight = 210 - scrollPos;
if (amountHeight < 80) { if (amountHeight < 80) {
amountHeight = 80; amountHeight = 80;
} }
var contentMargin = amountHeight; var contentMargin = amountHeight;
if (contentMargin > 230) { if (contentMargin > 210) {
contentMargin = 230; contentMargin = 210;
} }
var amountScale = (amountHeight / 230); var amountScale = (amountHeight / 210);
if (amountScale < 0.5) { if (amountScale < 0.5) {
amountScale = 0.5; amountScale = 0.5;
} }
@ -354,9 +354,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
top = TOP_BALANCE_BUTTON; top = TOP_BALANCE_BUTTON;
} }
var amountTop = ((amountScale - 0.85) / 0.85) * top; var amountTop = ((amountScale - 0.80) / 0.80) * top; //0.85
if (amountTop < -10) { if (amountTop < -2) {
amountTop = -10; amountTop = -2;
} }
if (amountTop > top) { if (amountTop > top) {
amountTop = top; amountTop = top;

19
src/sass/views/walletDetails.scss
View file

@ -132,10 +132,15 @@
position: relative; position: relative;
height: 100%; height: 100%;
height: calc(100% - env(safe-area-inset-bottom) * 2); height: calc(100% - env(safe-area-inset-bottom) * 2);
&.status-bar {
margin-top: 20px;
margin-top: env(safe-area-inset-top);
}
} }
.bar-header { .bar-header {
border: 0; border: 0;
background: none; background: rgb(238, 182, 64);
.title, .button { .title, .button {
color: #fff; color: #fff;
} }
@ -143,13 +148,13 @@
background-color: transparent; background-color: transparent;
} }
} }
//.nav-bar-block, .bar { .nav-bar-block, .bar {
//background-color: inherit !important; background-color: inherit !important;
//} }
ion-content { ion-content {
&.collapsible { &.collapsible {
margin-top: 210px; margin-top: 230px;
} }
padding-top: 0; padding-top: 0;
@ -189,7 +194,7 @@
.send-receive-buttons { .send-receive-buttons {
max-width: 600px; max-width: 600px;
margin: 45px auto 0; margin: 25px auto 0;
>.col { >.col {
padding: 5px 10px; padding: 5px 10px;
margin-bottom: 0; margin-bottom: 0;
@ -211,7 +216,7 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
color: #fff; color: #fff;
height: 210px; height: 230px;
padding-top: 40px; padding-top: 40px;
display: block; display: block;
align-items: center; align-items: center;