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

Merge pull request #3 from bechi/t 

fix layout style
This commit is contained in:
Matias Pando 2014-09-11 13:06:06 -03:00
parent bc0790dc3e 7095750d6f
commit f1a0a5ce91
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/src/main.css
View File

@ -1046,7 +1046,7 @@ a.text-warning:hover {color: #FD7262;}
background: #2C3E50; background: #2C3E50;
-moz-box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20); -moz-box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20); box-shadow: 0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
margin-bottom: 5px; margin-bottom: 15px;
} }
.box-setup-copay-required { .box-setup-copay-required {

18
views/copayers.html
View File

@ -51,7 +51,7 @@
</div> </div>
<div class="box-setup-copayers p20"> <div class="box-setup-copayers p20">
<p class="text-gray m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p> <p class="text-primary m10b" translate>Creating and storing a backup will allow to restore funds of the wallet</p>
<div class="oh"> <div class="oh">
<div ng-include="'views/includes/copayer.html'"></div> <div ng-include="'views/includes/copayer.html'"></div>
<div ng-if="!$root.wallet.publicKeyRing.isComplete()"> <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
@ -75,14 +75,7 @@
</div> </div>
</div> </div>
</div> </div>
<a class="small" ng-click="skipBackup()" <button class="button primary right m0"
ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
<span translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
Skip Backup
</span>
</a>
<button class="button primary m0"
ng-click="backup()" ng-click="backup()"
ng-show="!$root.wallet.publicKeyRing.isBackupReady()" ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
ng-disabled="!$root.wallet.publicKeyRing.isComplete()"> ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
@ -100,6 +93,13 @@
<span translate>yet to join.</span> <span translate>yet to join.</span>
</span> </span>
</button> </button>
<a class="text-primary m15t m20r right" ng-click="skipBackup()"
ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
<span class="size-12" translate ng-show="$root.wallet.publicKeyRing.isComplete()" >
Skip Backup
</span>
</a>
<button class="button primary" <button class="button primary"
disabled="disabled" disabled="disabled"
ng-show="$root.wallet.publicKeyRing.isBackupReady()"> ng-show="$root.wallet.publicKeyRing.isBackupReady()">

2
views/join.html
View File

@ -69,7 +69,7 @@
name="joinPasswordConfirm" name="joinPasswordConfirm"
ng-model="joinPasswordConfirm" ng-model="joinPasswordConfirm"
match="joinPassword" required> match="joinPassword" required>
<a class="expand small" ng-click="hideAdv=!hideAdv"> <a class="expand small left" ng-click="hideAdv=!hideAdv">
<span translate ng-hide="!hideAdv">Show</span> <span translate ng-hide="!hideAdv">Show</span>
<span translate ng-hide="hideAdv">Hide</span> <span translate ng-hide="hideAdv">Hide</span>
<span translate>advanced options</span> <span translate>advanced options</span>