anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix Conflicts:

Browse source 
css/main.css
This commit is contained in:
Gustavo Maximiliano Cortez 2014-07-31 23:10:38 -03:00
commit f9161ed8f2
6 changed files with 160 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/join.html
View file

@ -9,7 +9,7 @@
</div>
<div class="large-8 columns line-dashed-setup-v">
<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>
<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%;">
@ -38,7 +38,7 @@
</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 type="password" class="form-control"
placeholder="Choose your password" name="joinPassword"