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

Merge pull request #1254 from bechi/bugs/ui 

Bugs/ui
This commit is contained in:
Yemel Jardi 2014-09-03 14:38:19 -03:00
parent 63db84af2a 8485d839f5
commit 2a6b78c199
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/src/main.css
View File

@ -53,19 +53,19 @@
} }
::-webkit-input-placeholder { ::-webkit-input-placeholder {
color: #7A8C9E; color: #4D657C;
} }
:-moz-placeholder { /* Firefox 18- */ :-moz-placeholder { /* Firefox 18- */
color: #7A8C9E; color: #4D657C;
} }
::-moz-placeholder { /* Firefox 19+ */ ::-moz-placeholder { /* Firefox 19+ */
color: #7A8C9E; color: #4D657C;
} }
:-ms-input-placeholder { :-ms-input-placeholder {
color: #7A8C9E; color: #4D657C;
} }
#qr-canvas { display: none; } #qr-canvas { display: none; }
@ -167,7 +167,7 @@ a:hover {
-moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; -moz-box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important; box-shadow: inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
border: 0 !important; border: 0 !important;
color: #7A8C9E !important; color: #fff !important;
} }
.open select, .open select,
@ -177,7 +177,7 @@ a:hover {
.settings select { .settings select {
background: #2C3E50 !important; background: #2C3E50 !important;
border: 0 !important; border: 0 !important;
color: #7A8C9E !important; color: #fff !important;
} }
.page, .main { .page, .main {
@ -1110,6 +1110,7 @@ a.text-warning:hover {color: #FD7262;}
float: left; float: left;
margin-left: 2rem; margin-left: 2rem;
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word;
width: 55%; width: 55%;
text-align: left; text-align: left;
} }

5
css/src/mobile.css
View File

@ -127,5 +127,10 @@
display: none; display: none;
} }
.addresses .list-addr contact {
margin-left: 0;
font-size: 14px;
}
} }

15
views/addresses.html
View File

@ -8,21 +8,24 @@
<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">
<ul> <ul>
<li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll"> <li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll" ng-click="openAddressModal(addr)">
<div class="large-8 small-6 column"> <div class="large-10 medium-9 small-8 column" >
<div class="ellipsis list-addr"> <div class="ellipsis list-addr">
<i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i> <i class="fi-thumbnails size-48 show-for-large-up">&nbsp;</i>
<span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span> <span>
<contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
</span>
<span class="btn-copy" clip-copy="addr.address"> </span>
<small class="label" ng-if="addr.isChange">change</small> <small class="label" ng-if="addr.isChange">change</small>
</div> </div>
</div> </div>
<div class="large-4 small-6 column text-right"> <div class="large-2 medium-3 small-4 column text-right">
<span ng-if="$root.updatingBalance"> <span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> <i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span> </span>
<span ng-if="!$root.updatingBalance"> <span class="size-12" ng-if="!$root.updatingBalance">
{{addr.balance || 0|noFractionNumber}} {{$root.unitName}} {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
</span> </span>
</div> </div>

2
views/includes/copayer.html
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="success label m10t" ng-show="isBackupReady(copayer)"> <div class="success label m10t" ng-show="isBackupReady(copayer)">
Backup ready Ready
</div> </div>
</div> </div>
</div> </div>