fix layout details signup

This commit is contained in:
Bechi 2014-07-03 12:32:01 -03:00
parent 108824e294
commit 2685cfe32d
2 changed files with 65 additions and 66 deletions

View File

@ -197,9 +197,9 @@ span.panel-res {
} }
.line-dashed { .line-dashed {
border-top: 2px dashed #ccc; border-top: 1px dashed #ccc;
margin: 1rem 0; margin: 1rem 0;
padding: 1rem 0; /* padding: 1rem 0; */
} }
@ -271,7 +271,7 @@ hr { margin: 2.25rem 0;}
.p70l {padding-left: 70px;} .p70l {padding-left: 70px;}
.p5h {padding: 0 5px;} .p5h {padding: 0 5px;}
.p20h {padding: 0 20px;} .p20h {padding: 0 20px;}
.m30v {margin: 30px 0;} .m30v {/* margin: 30px 0; */}
.m10h {margin:0 10px;} .m10h {margin:0 10px;}
.m30a {margin: 30px auto;} .m30a {margin: 30px auto;}
.br100 {border-radius: 100%;} .br100 {border-radius: 100%;}

View File

@ -122,7 +122,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row m10t">
<div class="large-12 medium-12 small-12 columns "> <div class="large-12 medium-12 small-12 columns ">
<div class="box-setup-copayers"> <div class="box-setup-copayers">
<div class="box-setup-copayers-fix"> <div class="box-setup-copayers-fix">
@ -131,15 +131,17 @@
src="./img/satoshi.gif" src="./img/satoshi.gif"
title="Copayer {{$index+1}}-{{totalCopayers}}" title="Copayer {{$index+1}}-{{totalCopayers}}"
ng-class="{'box-setup-copay-required': ($index+1) <= $root.wallet.publicKeyRing.registeredCopayers()}"> ng-class="{'box-setup-copay-required': ($index+1) <= $root.wallet.publicKeyRing.registeredCopayers()}">
</div>
</div>
</div>
<div class="large-12 columns">
<div class="line-dashed"></div>
<button class="button primary radius right" <button class="button primary radius right"
ng-click="backupAndOpen()" ng-click="backupAndOpen()"
ng-disabled="!$root.wallet.publicKeyRing.isComplete()"> ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
Backup keys and continue Backup keys and continue
</button> </button>
<a href="" class="db p10t left" ng-disabled="!$root.wallet.publicKeyRing.isComplete()">Skip Backup</a>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -247,8 +249,8 @@
<h3>Join a Wallet in Creation</h3> <h3>Join a Wallet in Creation</h3>
<form name="joinForm" ng-submit="join(joinForm)" novalidate> <form name="joinForm" ng-submit="join(joinForm)" novalidate>
<input type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required> <input type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
<input type="password" class="form-control" placeholder="Choose your password" name="joinPassword" ng-model="$parent.joinPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: {{passwordStrength}}<br/><small>Tip: Use lower and uppercase, numbers and symbols</small>" tooltip-trigger="focus" required>
<input type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname"> <input 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" ng-model="$parent.joinPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: {{passwordStrength}}<br/><small>Tip: Use lower and uppercase, numbers and symbols</small>" tooltip-trigger="focus" required>
<button type="submit" class="button primary radius" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button> <button type="submit" class="button primary radius" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
</form> </form>
</div> </div>
@ -314,16 +316,15 @@
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> <i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
Creating wallet... Creating wallet...
</div> </div>
<div ng-show="!loading"> <div ng-show="!loading" class="large-8 medium-12 small-12 columns large-centered">
<form name="setupForm" ng-submit="create(setupForm)" novalidate> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<h3>Create new wallet</h3> <h3>Create new wallet</h3>
<div class="row"> <div>
<div class="small-12 medium-8 medium-centered large-8 large-centered columns">
<label>Wallet name <small>Optional</small> <label>Wallet name <small>Optional</small>
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName"> <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
</label> </label>
</div> </div>
<div class="small-12 medium-8 medium-centered large-8 large-centered columns"> <div>
<div class="row"> <div class="row">
<div class="small-12 medium-6 large-6 columns"> <div class="small-12 medium-6 large-6 columns">
<label>Your name <small>Optional</small> <label>Your name <small>Optional</small>
@ -338,7 +339,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup"> <div class="box-setup">
<fieldset> <fieldset>
<div class="row"> <div class="row">
<div class="large-6 medium-6 columns line-dashed-v"> <div class="large-6 medium-6 columns line-dashed-v">
@ -356,7 +357,6 @@
</div> </div>
</fieldset> </fieldset>
</div> </div>
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m10b">
<div class="box-setup-copayers"> <div class="box-setup-copayers">
<div class="box-setup-copayers-fix"> <div class="box-setup-copayers-fix">
<img class="box-setup-copay" ng-repeat="i in getNumber(totalCopayers) track by $index" <img class="box-setup-copay" ng-repeat="i in getNumber(totalCopayers) track by $index"
@ -365,10 +365,9 @@
ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}"> ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}">
</div> </div>
</div> </div>
</div>
</div>
<div class="row line-dashed"> <div class="row">
<div class="line-dashed"></div>
<div class="large-6 medium-6 small-5 columns text-left"> <div class="large-6 medium-6 small-5 columns text-left">
<a class="button secondary radius" href="#signin">Go back</a> <a class="button secondary radius" href="#signin">Go back</a>
</div> </div>