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

Merge pull request #2792 from bechi/details

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
public/views/copayers.html
View file

@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<div class="text-center m10t" ng-if="index.isCordova"> <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)"> ng-click="copayers.shareSecret(index.walletSecret)">
<i class="fi-share"></i> <i class="fi-share"></i>
<span translate>Share invitation</span> <span translate>Share invitation</span>
@ -48,7 +48,7 @@
<h1 translate>Wallet incomplete and broken</h1> <h1 translate>Wallet incomplete and broken</h1>
<h4 translate>Delete it and create a new one</h4> <h4 translate>Delete it and create a new one</h4>
</div> </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> <i class="fi-trash"></i> <span translate>Cancel</span>
</button> </button>
</div> </div>
@ -58,4 +58,3 @@
<div class="extra-margin-bottom"></div> <div class="extra-margin-bottom"></div>

8
public/views/create.html
View file

@ -21,17 +21,19 @@
</div> </div>
</div> </div>
<div class="create-tab" ng-hide="create.hideTabs"> <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
<div class="tab-container"> <div class="row">
<div class="tab-container small-6 medium-3 large-2">
<a href <a href
ng-class="{'selected': totalCopayers == 1}" ng-class="{'selected': totalCopayers == 1}"
ng-click="create.setTotalCopayers(1)" translate>Personal Wallet</a> ng-click="create.setTotalCopayers(1)" translate>Personal Wallet</a>
</div> </div>
<div class="tab-container"> <div class="tab-container small-6 medium-3 large-2">
<a href <a href
ng-class="{'selected': totalCopayers != 1}" ng-class="{'selected': totalCopayers != 1}"
ng-click="create.setTotalCopayers(3)" translate>Shared Wallet</a> ng-click="create.setTotalCopayers(3)" translate>Shared Wallet</a>
</div> </div>
</div>
</div> </div>
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate> <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>

6
src/css/mobile.css
View file

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