diff --git a/browser-extensions/include b/browser-extensions/include index fe440a152..04f4f8513 100644 --- a/browser-extensions/include +++ b/browser-extensions/include @@ -3,8 +3,11 @@ font img js sound +views config.js version.js index.html popup.html lib/angular/angular-csp.css +lib/angular/angular.min.js.map +lib/angular-route/angular-route.min.js.map \ No newline at end of file diff --git a/css/main.css b/css/main.css index 676cad725..8b8e10278 100644 --- a/css/main.css +++ b/css/main.css @@ -1116,5 +1116,11 @@ a.text-white:hover {color: #ccc;} .btn-copy.zeroclipboard-is-hover { color: #000; } .btn-copy.zeroclipboard-is-active { opacity: 1; } +@media only screen and (min-width: 40.063em) { + dialog.tiny, .reveal-modal.tiny { + width: 50%; + margin-left: -25%; + } +} /*-----------------------------------------------------------------*/ diff --git a/css/mobile.css b/css/mobile.css index 12e34e065..9049147ea 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -114,6 +114,13 @@ display: block; float: none; margin: 0 auto; + width: 210px; + height: 210px; + } + + .panel qrcode canvas { + width: 200px; + height: 200px; } .btn-copy { diff --git a/index.html b/index.html index 2188f3e9a..f09603637 100644 --- a/index.html +++ b/index.html @@ -109,22 +109,7 @@ - + diff --git a/js/mobile.js b/js/mobile.js new file mode 100644 index 000000000..ea1487c78 --- /dev/null +++ b/js/mobile.js @@ -0,0 +1,16 @@ +'use strict'; + +document.addEventListener("deviceready", onDeviceReady, false); + +function onDeviceReady() { + setTimeout(function(){ navigator.splashscreen.hide(); }, 2000); + + document.addEventListener("menubutton", function() { + var nav = document.getElementsByTagName('nav')[0]; + if (!nav) return; + + var menu = nav.getElementsByTagName('section')[0].getElementsByTagName('a')[0]; + if (menu.offsetParent) menu.click(); + + }, false); +} \ No newline at end of file diff --git a/js/services/uriHandler.js b/js/services/uriHandler.js index da9dd8695..b69ed4497 100644 --- a/js/services/uriHandler.js +++ b/js/services/uriHandler.js @@ -6,7 +6,8 @@ UriHandler.prototype.register = function() { var base = window.location.origin + '/'; var url = base + '#!/uri-payment/%s'; - if(navigator.registerProtocolHandler) { + var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; + if(navigator.registerProtocolHandler && !isFirefox) { navigator.registerProtocolHandler('bitcoin', url, 'Copay'); } }; diff --git a/popup.html b/popup.html index e73f92a7f..9e8c7df4c 100644 --- a/popup.html +++ b/popup.html @@ -26,7 +26,7 @@ - Open wallet - Settings + Open wallet + Settings diff --git a/views/join.html b/views/join.html index 89c2f9cf5..8de78dad0 100644 --- a/views/join.html +++ b/views/join.html @@ -46,6 +46,7 @@ +
- -

{{address.address}}

+ -
+
+

{{address.address}}

- +

{{address.balance || 0|noFractionNumber}} {{$root.unitName}} - -

- -   Open in external application - -
+

+
×