diff --git a/src/js/routes.js b/src/js/routes.js index c09789ab2..b2c2abce5 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -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) { diff --git a/src/sass/shame.scss b/src/sass/shame.scss index 50c888ce6..3e5e16f68 100644 --- a/src/sass/shame.scss +++ b/src/sass/shame.scss @@ -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; +} diff --git a/src/sass/views/import.scss b/src/sass/views/import.scss index 1edb3406c..fe6567282 100644 --- a/src/sass/views/import.scss +++ b/src/sass/views/import.scss @@ -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; + } } diff --git a/src/sass/views/join.scss b/src/sass/views/join.scss new file mode 100644 index 000000000..601fff97c --- /dev/null +++ b/src/sass/views/join.scss @@ -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; + } +} diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss index fa0ea55ff..8308bd90c 100644 --- a/src/sass/views/tab-send.scss +++ b/src/sass/views/tab-send.scss @@ -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; } diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 3fa9643f1..67c41b25f 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -20,6 +20,7 @@ @import "includes/actionSheet"; @import "export"; @import "import"; +@import "join"; @import "includes/walletActivity"; @import "includes/wallets"; @import "includes/modals/modals"; diff --git a/www/views/join.html b/www/views/join.html index ce24cbf10..a8a7a812c 100644 --- a/www/views/join.html +++ b/www/views/join.html @@ -1,4 +1,4 @@ - + @@ -21,25 +21,26 @@ ng-required="true"> -