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

Merge pull request #1042 from yemel/feature/add-limit-feedback 

WIP: Add comment about #copayers and #signatures limits
This commit is contained in:
Matias Alejo Garcia 2014-08-07 00:57:11 -03:00
parent 1a5d28fb50 4c4f20afb6
commit 35f379f8c8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/main.css
View File

@ -132,6 +132,11 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
font-weight: 100;
}
.setup .comment {
font-size: 0.875rem;
color: #7A8C9E !important;
}
a:hover {
color: #2980b9;
}
@ -1020,7 +1025,7 @@ a.text-warning:hover {color: #FD7262;}
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);
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: 20px;
margin-bottom: 5px;
}
.box-setup-copay-required {

5
views/setup.html
View File

@ -47,13 +47,13 @@
</div>
<div class="row" ng-show="!isSetupWalletPage">
<div class="large-6 medium-6 columns">
<label>Select total number of copayers
<label>Select total number of copayers (*)
<select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
</select>
</label>
</div>
<div class="large-6 medium-6 columns">
<label>Select required signatures
<label>Select required signatures (*)
<select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
</select>
</label>
@ -68,6 +68,7 @@
width="50px">
</div>
</div>
<p class="comment">(*) The limits are imposed by the bitcoin network.</p>
<div class="text-right">
<a ng-show="!isSetupWalletPage" class="back-button m20r" href="#!/">&laquo; Back</a>
<a ng-show="isSetupWalletPage" class="back-button m20r"