fix : Scanner and keyboard at same time

This commit is contained in:
Gabriel Bazán 2016-10-26 15:54:29 -03:00
commit 1ebba5c0d0
10 changed files with 83 additions and 49 deletions

View file

@ -919,13 +919,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
window.addEventListener('native.keyboardshow', function() {
document.querySelector('div.tabs').style.display = 'none';
angular.element(document.querySelector('ion-content.has-tabs')).css('bottom', 0);
});
window.addEventListener('native.keyboardhide', function() {
var tabs = document.querySelectorAll('div.tabs');
angular.element(tabs[0]).css('display', '');
document.body.classList.add('keyboard-open');
});
$ionicPlatform.registerBackButtonAction(function(e) {

View file

@ -152,25 +152,11 @@ input[type=number] {
margin: 0 auto;
}
.qr-icon {
line-height: 45px;
}
.input-notification {
float: right;
margin-right: 10px;
}
.qr-scan-icon a {
display: block;
position: absolute;
top: 25px;
right: 0;
padding: 0 10px;
font-size: 24px;
cursor: pointer;
}
.pr {
position: relative;
}
@ -443,3 +429,11 @@ input[type=file] {
.left {
float: left;
}
.keyboard-open .tabs {
display: none;
}
.keyboard-open .has-tabs {
bottom: 0;
}

View file

@ -9,4 +9,17 @@
border-bottom-width: 2px;
border-bottom-color: #172565;
}
.qr-scan-icon a {
z-index: 10;
display: block;
position: absolute;
top: 14px;
right: 0;
padding: 0 10px;
font-size: 24px;
cursor: pointer;
}
.qr-icon {
line-height: 45px;
}
}

15
src/sass/views/join.scss Normal file
View file

@ -0,0 +1,15 @@
#join {
.qr-scan-icon a {
z-index: 10;
display: block;
position: absolute;
top: 115px;
right: 0;
padding: 0 10px;
font-size: 24px;
cursor: pointer;
}
.qr-icon {
line-height: 45px;
}
}

View file

@ -1,4 +1,17 @@
#tab-send {
.qr-scan-icon a {
z-index: 10;
display: block;
position: absolute;
top: 55px;
right: 0;
padding: 0 10px;
font-size: 24px;
cursor: pointer;
}
.qr-icon {
line-height: 45px;
}
.zero-state-cta {
padding-bottom: 3vh;
}

View file

@ -20,6 +20,7 @@
@import "includes/actionSheet";
@import "export";
@import "import";
@import "join";
@import "includes/walletActivity";
@import "includes/wallets";
@import "includes/modals/modals";