diff --git a/bower.json b/bower.json index ef00f8bc7..80e3c20d3 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,8 @@ "mocha": "~1.18.2", "chai": "~1.9.1", "crypto-js": "http://crypto-js.googlecode.com/files/CryptoJS%20v3.1.2.zip", - "sjcl":"1.0.0", - "file-saver": "*" + "sjcl": "1.0.0", + "file-saver": "*", + "qrcode-decoder-js": "*" } } diff --git a/css/main.css b/css/main.css index 779713c4f..e53b36b58 100644 --- a/css/main.css +++ b/css/main.css @@ -25,6 +25,7 @@ html, body {height: 100%;} padding: 5px 2rem; bottom: 0; width: 100%; + z-index: 100; } .bottom-copay { @@ -427,3 +428,8 @@ a.loading { background: #fff; } +#qr-canvas { display: none; } +#qrcode-scanner-video { + display: block; + margin: 0 auto; +} diff --git a/index.html b/index.html index a675ee395..c04e4c846 100644 --- a/index.html +++ b/index.html @@ -462,13 +462,40 @@