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

fix icon-status

This commit is contained in:
bechi 2014-07-31 15:46:20 -03:00
parent 25bedef1fc
commit ccd537751b
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
css/main.css
View File

@ -280,36 +280,35 @@ a:hover {
} }
.last-transactions-content .box-status { .last-transactions-content .box-status {
text-align: center; font-size: 13px;
font-size: 14px; width: 35px;
} }
.last-transactions-content .box-copayer { .last-transactions-content .box-copayer {
width: 60px; width: 100px;
margin-right: 20px; margin-right: 20px;
float: left; float: left;
text-align: center; text-align: center;
} }
.last-transactions-content .copayer-ico { .last-transactions-content .copayer-ico {
width: 30px; width: 45px;
height: 30px; height: 45px;
} border: 2px solid #7A8C9B;
.last-transactions-content .box-copayer .icon-inactive {
color: #4C5B69;
} }
.last-transactions-content .box-copayer .icon-active { .last-transactions-content .box-copayer .icon-active {
color: #ccc; color: #fff;
} }
.last-transactions-content .box-copayer .icon-active-check { .last-transactions-content .box-copayer .icon-active-check {
color: #3FBC9C; background-color: #3FBC9C;
color: #fff;
} }
.last-transactions-content .box-copayer .icon-active-x { .last-transactions-content .box-copayer .icon-active-x {
color: #C0392B; background-color: #C0392B;
color: #fff;
} }
.input-note { .input-note {
@ -944,6 +943,19 @@ button, .button, p {
padding: 0.2rem 0.4rem; padding: 0.2rem 0.4rem;
} }
.box-status {
float: right;
}
.icon-status {
background-color: #34495E;
color: #7A8C9E;
border-radius: 100%;
padding: 0.17rem 0.3rem;
float: left;
margin-bottom: 0.2rem;
}
.has-error { .has-error {
color: #C0392A; color: #C0392A;
} }

4
views/join.html
View File

@ -9,7 +9,7 @@
</div> </div>
<div class="large-8 columns line-dashed-setup-v"> <div class="large-8 columns line-dashed-setup-v">
<div class="box-setup"> <div class="box-setup">
<h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1> <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
<form name="joinForm" ng-submit="join(joinForm)" novalidate> <form name="joinForm" ng-submit="join(joinForm)" novalidate>
<label for="connectionId"> Wallet Setting </label> <label for="connectionId"> Wallet Setting </label>
<input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;"> <input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;">
@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<label for="joinPassword"> User info</label> <label for="joinPassword"> User info </label>
<input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname"> <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
<input type="password" class="form-control" <input type="password" class="form-control"
placeholder="Choose your password" name="joinPassword" placeholder="Choose your password" name="joinPassword"

5
views/transactions.html
View File

@ -52,6 +52,9 @@
<a ng-if="action == 'seen'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}"> <a ng-if="action == 'seen'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Seen {{ts | amTimeAgo}}">
<i class="fi-eye icon-status icon-active"></i> <i class="fi-eye icon-status icon-active"></i>
</a> </a>
<a ng-if="action == 'asd'" href="#!/transactions" class="icon-status">
<i class="fi-loop icon-rotate"></i>
</a>
<a ng-if="action == 'sign'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}"> <a ng-if="action == 'sign'" href="#!/transactions" tooltip-popup-delay="1000" tooltip="Signed {{ts | amTimeAgo}}">
<i class="fi-check icon-status icon-active-check"></i> <i class="fi-check icon-status icon-active-check"></i>
</a> </a>
@ -62,7 +65,7 @@
</div> </div>
<div class="text-center"> <div class="text-center">
<p class="size-12 text-gray"> <p class="size-12 text-gray ellipsis">
{{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}} {{$root.wallet.publicKeyRing.nicknameForCopayer(cId)}}
</p> </p>
</div> </div>