Fix mobile/desktop notifications. Fix popup QR-Code

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-22 15:53:18 -03:00
parent dc22571025
commit 14a86ecccc
3 changed files with 65 additions and 33 deletions

View File

@ -140,7 +140,8 @@ header .alt-currency {
right: 14px; right: 14px;
width: 220px; width: 220px;
list-style-type: none; list-style-type: none;
top: 47px;nt top: 47px;
z-index: 10001;
} }
.head .menu ul li.divider { .head .menu ul li.divider {
@ -666,7 +667,7 @@ input[type=number]::-webkit-outer-spin-button {
} }
.dr-notification-container.top { .dr-notification-container.top {
top: 20px; top: 60px;
} }
.dr-notification-container.center { .dr-notification-container.center {
@ -675,15 +676,14 @@ input[type=number]::-webkit-outer-spin-button {
} }
.dr-notification-wrapper { .dr-notification-wrapper {
width: 360px; width: 400px;
position: relative; position: relative;
margin: 10px 0; margin: 0 0 1px 0;
} }
.dr-notification { .dr-notification {
width: 360px; width: 400px;
clear: both; clear: both;
height: 90px;
overflow: hidden; overflow: hidden;
} }
@ -694,17 +694,15 @@ input[type=number]::-webkit-outer-spin-button {
border-radius: 20px; border-radius: 20px;
display: inline-block; display: inline-block;
padding: 5px; padding: 5px;
font-size: 12px; font-size: 18px;
position: absolute; position: absolute;
right: 350px; right: 5px;
top: -8px; top: 5px;
cursor: pointer; cursor: pointer;
z-index: 10; z-index: 10;
} }
.dr-notification-image { .dr-notification-image {
width: 80px;
height: 90px;
float: left; float: left;
display: block; display: block;
font-size: 40px; font-size: 40px;
@ -715,7 +713,7 @@ input[type=number]::-webkit-outer-spin-button {
.dr-notification-image i { .dr-notification-image i {
display: block; display: block;
width: 100%; width: 100%;
padding-top: 20px; padding: 20px;
} }
.dr-notification-image img { .dr-notification-image img {
margin: 15px; margin: 15px;
@ -724,15 +722,16 @@ input[type=number]::-webkit-outer-spin-button {
} }
.dr-notification-content { .dr-notification-content {
padding-left: 90px; padding-left: 80px;
padding-right: 10px; padding-right: 30px;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px;
} }
.dr-notification-title { .dr-notification-title {
color: white; color: white;
padding: 0px; padding: 0px;
font-size: 18px; font-size: 16px;
margin-top: 0; margin-top: 0;
} }
@ -740,8 +739,6 @@ input[type=number]::-webkit-outer-spin-button {
background-color: #34495E; background-color: #34495E;
color: #eee; color: #eee;
border: 1px solid #2C3E50; border: 1px solid #2C3E50;
opacity: 0.9;
} }
.dr-notification-close-btn { .dr-notification-close-btn {
background-color: #34495E; background-color: #34495E;

View File

@ -183,5 +183,41 @@
margin-top: 10px; margin-top: 10px;
} }
/* notifications */
.dr-notification {
width: 100%;
}
.dr-notification-container {
width: 100%;
}
.dr-notification-container.top {
top: 2.813rem;
}
.dr-notification-wrapper {
width: 100%;
margin: 0;
}
.dr-notification-close-btn {
font-size: 20px;
}
.dr-notification-image {
font-size: 30px;
}
.dr-notification-text {
font-size: 10px;
line-height: 100%;
}
.dr-notification-image i {
padding: 15px;
}
} }

View File

@ -1,22 +1,21 @@
<div class="text-center"> <div class="text-center">
<qrcode size="220" data="bitcoin:{{address.address}}"></qrcode> <qrcode size="220" data="{{address.address}}"></qrcode>
<div class="m10t"> <div class="m10t" ng-init="label = $root.wallet.addressBook[address.address].label">
<h4 class="size-12">{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4> <div class="size-12">
<span ng-if="$root.updatingBalance"> {{address.address}} <small class="label" ng-show="address.isChange">change</small>
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<p class="m15b size-18" ng-if="!$root.updatingBalance">
{{address.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</p>
<div class="small-10 columns small-centered">
<button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.address)">
<i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
</button>
<a class="m15t secondary" open-external address="{{address.address}}">
<span translate>Open in external application</span>
</a>
</div> </div>
<b class="db m5t" ng-show="label">
({{label}})
</b>
<p class="m10t size-18">
<span ng-show="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-show="!$root.updatingBalance">
{{address.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}
</span>
</p>
</div> </div>
</div> </div>
<a class="close-reveal-modal" ng-click="cancel()">&#215;</a> <a class="close-reveal-modal" ng-click="cancel()">&#215;</a>