Merge pull request #2792 from bechi/details

Details
This commit is contained in:
Matias Alejo Garcia 2015-05-29 19:36:26 -03:00
commit 6ec8e0c0c3
3 changed files with 19 additions and 16 deletions

View file

@ -1,5 +1,5 @@
<div
class="topbar-container"
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="">
</div>
@ -8,7 +8,7 @@
<div ng-show="!index.notAuthorized">
<div class="row m10t text-center">
<div class="large-12 columns">
<h1 translate>Share this invitation with your copayers</h1>
<h1 translate>Share this invitation with your copayers</h1>
</div>
</div>
@ -21,9 +21,9 @@
</div>
</div>
<div class="text-center m10t" ng-if="index.isCordova">
<span class="button outline dark-gray tiny"
<span class="button outline round dark-gray tiny"
ng-click="copayers.shareSecret(index.walletSecret)">
<i class="fi-share"></i>
<i class="fi-share"></i>
<span translate>Share invitation</span>
</span>
</div>
@ -31,7 +31,7 @@
<span translate>Waiting for copayers</span>
<span class="text-gray right">
[ {{index.m}} <span translate>of</span> {{index.n}} ]
</span>
</span>
</h4>
<div class="p10 line-b" ng-include="'views/includes/copayers.html'"></div>
<div ng-if="!index.isComplete" class="p10 line-b m20b">
@ -48,7 +48,7 @@
<h1 translate>Wallet incomplete and broken</h1>
<h4 translate>Delete it and create a new one</h4>
</div>
<button class="small warning expand" ng-click="copayers.deleteWallet()">
<button class="small warning expand round" ng-click="copayers.deleteWallet()">
<i class="fi-trash"></i> <span translate>Cancel</span>
</button>
</div>
@ -58,4 +58,3 @@
<div class="extra-margin-bottom"></div>

View file

@ -21,17 +21,19 @@
</div>
</div>
<div class="create-tab" ng-hide="create.hideTabs">
<div class="tab-container">
<a href
<div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
<div class="row">
<div class="tab-container small-6 medium-3 large-2">
<a href
ng-class="{'selected': totalCopayers == 1}"
ng-click="create.setTotalCopayers(1)" translate>Personal Wallet</a>
</div>
<div class="tab-container">
<a href
<div class="tab-container small-6 medium-3 large-2">
<a href
ng-class="{'selected': totalCopayers != 1}"
ng-click="create.setTotalCopayers(3)" translate>Shared Wallet</a>
</div>
</div>
</div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
@ -62,7 +64,7 @@
<div class="row" ng-show="totalCopayers != 1">
<div class="large-6 medium-6 columns">
<label><span translate>Select total number of copayers</span>
<select class="m10t" ng-model="totalCopayers"
<select class="m10t" ng-model="totalCopayers"
ng-options="totalCopayers as totalCopayers for totalCopayers in create.TCValues"
ng-change="create.setTotalCopayers(totalCopayers)">
</select>

View file

@ -248,6 +248,7 @@ ul.copayer-list img {
font-size: 14px;
}
a.missing-copayers {
bottom: -34px;
text-align: center;
@ -736,19 +737,20 @@ textarea:focus
.create-tab .tab-container {
float: left;
width: 50%;
}
.create-tab a {
font-size: .7rem;
padding: 0 0 .6rem;
color: #929396;
text-transform: uppercase;
font-weight: 500;
}
.create-tab a:hover,
.create-tab a:focus {
color: #2C3E50;
border-bottom: 3px solid #929396;
}
.create-tab a.selected,