Merge pull request #205 from Bitcoin-com/wallet/task/381

Improvement - 381 - QR codes with BCH/BTC overlay. Scrolling fix.
This commit is contained in:
Brendon Duncan 2018-07-04 09:46:30 +12:00 committed by GitHub
commit 0b2a793f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View file

@ -1,14 +1,15 @@
qrcode { qrcode {
&.qr-icon { position: relative;
&.qr-overlay {
&::before { &::before {
content: ""; content: "";
background-size: 100% 100%; background-size: 100% 100%;
display: block; display: block;
margin-left: calc(50% - 22px); left: 88px;
margin-top: 88px; margin-top: 88px;
width: 44px; width: 44px;
height: 44px; height: 44px;
position: absolute; position:absolute;
} }
&--bch::before { &--bch::before {
background-image: url('../img/qr-overlay-bch.png'); background-image: url('../img/qr-overlay-bch.png');

View file

@ -41,7 +41,7 @@
</button> </button>
</span> </span>
<qrcode class="qr-icon qr-icon--{{ wallet.coin }}" ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode> <qrcode class="qr-overlay qr-overlay--{{ wallet.coin }}" ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
<div class="address-label"> <div class="address-label">
<span class="ellipsis">{{addr}}</span> <span class="ellipsis">{{addr}}</span>
<ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner> <ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>