From a619be167caa8458d951a5bd44c93aa2504b63f5 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 31 Jul 2014 21:01:41 -0300 Subject: [PATCH 1/6] fix qr size --- css/mobile.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/css/mobile.css b/css/mobile.css index e57ce9e7d..ce4f3032e 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -114,6 +114,13 @@ display: block; float: none; margin: 0 auto; + width: 280px; + height: 280px; + } + + .panel qrcode canvas { + width: 270px; + height: 270px; } } From 30505ebb498eaaf787980a774ebc1033476e9e38 Mon Sep 17 00:00:00 2001 From: Yemel Jardi Date: Thu, 31 Jul 2014 21:20:43 -0300 Subject: [PATCH 2/6] Fix title position on join wallet screen --- views/join.html | 1 + 1 file changed, 1 insertion(+) diff --git a/views/join.html b/views/join.html index 179d89f48..46326093f 100644 --- a/views/join.html +++ b/views/join.html @@ -38,6 +38,7 @@ +
Date: Fri, 1 Aug 2014 09:39:41 -0300 Subject: [PATCH 3/6] fix qr on modal --- views/modals/qr-address.html | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html index ca80055e5..59eb264db 100644 --- a/views/modals/qr-address.html +++ b/views/modals/qr-address.html @@ -1,18 +1,17 @@
- -

{{address.address}}

-
+ + +
+

{{address.address}}

- +

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

- -   Open in external aplication - -
+

+
× From fe20e2dabd73cbf3a5cf954aac9dee42fbbd5cb3 Mon Sep 17 00:00:00 2001 From: Yemel Jardi Date: Fri, 1 Aug 2014 09:49:03 -0300 Subject: [PATCH 4/6] Update firefox extension --- browser-extensions/include | 3 +++ js/services/uriHandler.js | 3 ++- popup.html | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) 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/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 From 411bc1c85fb130e641f94e9dafe2ff0905ae065e Mon Sep 17 00:00:00 2001 From: Yemel Jardi Date: Fri, 1 Aug 2014 10:03:11 -0300 Subject: [PATCH 5/6] Update chrome extension --- index.html | 17 +---------------- js/mobile.js | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 js/mobile.js diff --git a/index.html b/index.html index acc29b64d..49beea330 100644 --- a/index.html +++ b/index.html @@ -107,22 +107,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 From a9f0bc5c6ff02e16af4c91bd99f0327b227cd2f1 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 1 Aug 2014 11:13:34 -0300 Subject: [PATCH 6/6] fix qr size mobile --- css/mobile.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/css/mobile.css b/css/mobile.css index ce4f3032e..1b2265124 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -114,13 +114,13 @@ display: block; float: none; margin: 0 auto; - width: 280px; - height: 280px; + width: 210px; + height: 210px; } .panel qrcode canvas { - width: 270px; - height: 270px; + width: 200px; + height: 200px; } }