BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1467 from bechi/bugs/ui-03 

Bugs/ui 03
This commit is contained in:
Matias Alejo Garcia 2014-09-23 16:29:11 -03:00
parent 6695314a8a 90e943f897
commit 5c1935e04b
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/src/main.css
View File

@ -944,7 +944,6 @@ button, .button, p {
} }
.addresses .list-addr contact { .addresses .list-addr contact {
margin-left: 42px;
cursor: text; cursor: text;
} }
@ -1157,6 +1156,10 @@ a.text-warning:hover {color: #FD7262;}
display: none; display: none;
} }
fieldset legend {
background: transparent;
}
@media only screen and (min-width: 40.063em) { @media only screen and (min-width: 40.063em) {
dialog.tiny, .reveal-modal.tiny { dialog.tiny, .reveal-modal.tiny {
width: 50%; width: 50%;

38
views/addresses.html
View File

@ -8,24 +8,28 @@
<div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length"> <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
<div class="large-12 medium-12" ng-init="showAll=0"> <div class="large-12 medium-12" ng-init="showAll=0">
<div class="oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll"> <div class="oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
<div class="panel radius row show-for-large-up"> <div class="panel radius show-for-large-up">
<div class="large-9 medium-9 column"> <div class="row collapse">
<div class="list-addr"> <div class="large-7 medium-9 column">
<i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i> <div class="list-addr">
<span> <span>
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"> <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
</span> </span>
<span class="btn-copy" clip-copy="addr.address"> </span> <span class="btn-copy" clip-copy="addr.address"> </span>
<small translate class="label" ng-if="addr.isChange">change</small> <small translate class="label" ng-if="addr.isChange">change</small>
</div>
</div>
<div class="large-3 medium-3 column text-right">
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<p class="size-14" ng-if="!$root.updatingBalance">
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</p>
</div>
<div class="large-1 columns show-for-large-up" ng-click="openAddressModal(addr)">
<a class="size-12" href=""> Show QR</a>
</div> </div>
</div>
<div class="large-3 medium-3 column text-right">
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<p class="size-14" ng-if="!$root.updatingBalance">
<b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
</p>
</div> </div>
</div> <!-- end of panel large screen --> </div> <!-- end of panel large screen -->
<a class="db text-black panel radius row hide-for-large-up list-addr" ng-click="openAddressModal(addr)"> <a class="db text-black panel radius row hide-for-large-up list-addr" ng-click="openAddressModal(addr)">

2
views/includes/transaction.html
View File

@ -8,7 +8,7 @@
</a> </a>
</div> </div>
<div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment"> <div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
<p class="size-14 label"> <p class="size-14 label ellipsis text-left">
{{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong> {{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
</p> </p>
</div> </div>