mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #240 from cmgustavo/feature/05-new-design
Feature/05 new design
This commit is contained in:
commit
b2f377da18
32
css/main.css
32
css/main.css
|
@ -13,10 +13,12 @@ html, body {height: 100%;}
|
||||||
|
|
||||||
#wrap {min-height: 100%;}
|
#wrap {min-height: 100%;}
|
||||||
|
|
||||||
#main {overflow:auto;
|
#main {
|
||||||
|
overflow:auto;
|
||||||
padding-bottom: 91px;} /* must be same height as the footer */
|
padding-bottom: 91px;} /* must be same height as the footer */
|
||||||
|
|
||||||
#footer {position: relative;
|
#footer {
|
||||||
|
position: relative;
|
||||||
margin-top: -91px; /* negative value of footer height */
|
margin-top: -91px; /* negative value of footer height */
|
||||||
height: 91px;
|
height: 91px;
|
||||||
clear:both;
|
clear:both;
|
||||||
|
@ -27,6 +29,7 @@ html, body {height: 100%;}
|
||||||
display: block;
|
display: block;
|
||||||
width: 130px;
|
width: 130px;
|
||||||
height: 51px;
|
height: 51px;
|
||||||
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
|
@ -180,6 +183,13 @@ span.panel-res {
|
||||||
margin: 0.5rem 0 1rem;
|
margin: 0.5rem 0 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.line-dashed {
|
||||||
|
border-top: 2px dashed #ccc;
|
||||||
|
margin: 3rem 0;
|
||||||
|
padding: 1rem 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
small.is-valid {
|
small.is-valid {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@ -389,6 +399,24 @@ hr { margin: 2.25rem 0;}
|
||||||
background: #C0392B;
|
background: #C0392B;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.box-signin {
|
||||||
|
padding: 20px 40px;
|
||||||
|
border: 1px solid #eee;
|
||||||
|
background-color: #fff;
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-signin h3 {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-signin .button {
|
||||||
|
margin: 20px 0;
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
a.loading {
|
a.loading {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
63
index.html
63
index.html
|
@ -139,58 +139,47 @@
|
||||||
Looking for peers...
|
Looking for peers...
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="!loading">
|
<div ng-show="!loading">
|
||||||
<div ng-show="!wallets.length">
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-6 columns">
|
<div class="large-6 columns">
|
||||||
<h3>Create a New Wallet</h3>
|
<div class="box-signin">
|
||||||
</div>
|
<h3>Join a Wallet in Creation</h3>
|
||||||
<div class="large-3 columns">
|
<input type="text" class="form-control" placeholder="Paste wallet secret here"
|
||||||
<button class="button secondary expand radius" ng-click="create()" ng-disabled="loading" loading="Creating">Create</button>
|
ng-model="connectionId" required autofocus>
|
||||||
|
<button class="button primary expand radius"
|
||||||
|
ng-click="join(connectionId)" ng-disabled="loading" loading="Joining">Join</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<div class="large-6 columns">
|
||||||
</div>
|
<div class="box-signin">
|
||||||
<div ng-show="wallets.length">
|
<div ng-show="wallets.length">
|
||||||
<div class="row">
|
|
||||||
<div class="large-6 columns">
|
|
||||||
<h3>Open Wallet</h3>
|
<h3>Open Wallet</h3>
|
||||||
<select class="form-control" ng-model="selectedWalletId"
|
<select class="form-control" ng-model="selectedWalletId"
|
||||||
ng-options="w.id as w.show for w in wallets">
|
ng-options="w.id as w.show for w in wallets">
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
<div class="large-3 columns">
|
|
||||||
<button class="button secondary expand radius" type="button"
|
<button class="button secondary expand radius" type="button"
|
||||||
ng-click="open(selectedWalletId)" ng-disabled="loading" loading="Opening">Open</button>
|
ng-click="open(selectedWalletId)" ng-disabled="loading" loading="Opening">Open</button>
|
||||||
|
</div>
|
||||||
|
<div ng-show="!wallets.length">
|
||||||
|
<h3>Create a new wallet</h3>
|
||||||
|
<input type="text" class="form-control" ng-model="walletName" placeholder="Wallet name (optional)">
|
||||||
|
<button class="button secondary expand radius" ng-click="create(walletName)" ng-disabled="loading" loading="Creating">Create</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
|
||||||
</div>
|
|
||||||
<div ng-show="true">
|
|
||||||
<div class="row">
|
|
||||||
<div class="large-6 columns">
|
|
||||||
<h3>Join a Wallet in Creation</h3>
|
|
||||||
<input type="text" class="form-control" placeholder="Paste wallet secret here"
|
|
||||||
ng-model="connectionId" required autofocus>
|
|
||||||
</div>
|
|
||||||
<div class="large-3 columns">
|
|
||||||
<button class="button primary expand radius"
|
|
||||||
ng-click="join(connectionId)" ng-disabled="loading" loading="Joining">Join</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns text-center line-dashed">
|
||||||
<div ng-show="wallets.length">
|
<span ng-show="wallets.length">
|
||||||
<a ng-click="create()" ng-disabled="loading" loading="Creating">Create a new wallet</a>
|
<a ng-click="create()" ng-disabled="loading" loading="Creating">Create a new wallet</a> ·
|
||||||
</div>
|
</span>
|
||||||
<a class="right" ng-href="#import">Import from file</a>
|
<a ng-href="#import">Import from file</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div> <!-- End !loading -->
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,9 @@ angular.module('copay.signin').controller('SigninController',
|
||||||
$scope.wallets = walletFactory.getWallets();
|
$scope.wallets = walletFactory.getWallets();
|
||||||
$scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null;
|
$scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null;
|
||||||
|
|
||||||
$scope.create = function() {
|
$scope.create = function(walletName) {
|
||||||
$scope.loading = true;
|
$scope.loading = true;
|
||||||
|
$rootScope.walletName = walletName;
|
||||||
$location.path('setup');
|
$location.path('setup');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue