Merge pull request #3340 from bechi/bug/tabs

fix tabs on manage wallet
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-27 09:50:13 -03:00
commit bb73a058a0
3 changed files with 21 additions and 26 deletions

View File

@ -36,14 +36,12 @@
<div class="create-tab small-only-text-center" ng-hide="create.hideTabs"> <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
<div class="row"> <div class="row">
<div class="tab-container small-6 medium-3 large-2"> <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers == 1}">
<a href <a href
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 small-6 medium-3 large-2"> <div class="tab-container small-6 medium-3 large-2" ng-class="{'selected': totalCopayers != 1}">
<a href <a href
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>

View File

@ -32,22 +32,16 @@
<div class="create-tab small-only-text-center" ng-hide="create.hideTabs"> <div class="create-tab pr small-only-text-center" ng-hide="create.hideTabs">
<div class="row"> <div class="row">
<div class="tab-container small-4 medium-4 large-4"> <div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type =='12'}">
<a href <a href ng-click="import.setType('12')" translate>Wallet Seed</a>
ng-class="{'selected': type =='12'}"
ng-click="import.setType('12')" translate>Wallet Seed</a>
</div> </div>
<div class="tab-container small-4 medium-4 large-4"> <div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type=='file'}">
<a href <a href ng-click="import.setType('file')" translate>File/Text Backup</a>
ng-class="{'selected': type=='file'}"
ng-click="import.setType('file')" translate>File/Text Backup</a>
</div> </div>
<div class="tab-container small-4 medium-4 large-4"> <div class="tab-container small-4 medium-4 large-4" ng-class="{'selected': type=='hwWallet'}">
<a href <a href ng-click="import.setType('hwWallet')" translate>Hardware Wallet</a>
ng-class="{'selected': type=='hwWallet'}"
ng-click="import.setType('hwWallet')" translate>Hardware Wallet</a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -773,33 +773,36 @@ textarea:focus
width: 100%; width: 100%;
border-bottom: 1px solid #DEDFE1; border-bottom: 1px solid #DEDFE1;
margin-bottom: 25px; margin-bottom: 25px;
padding: 0 0 .5rem 1rem;
overflow: hidden; overflow: hidden;
} }
.create-tab .tab-container { .create-tab .tab-container {
float: left; float: left;
text-align: center;
} }
.create-tab a { .create-tab a {
font-size: .7rem; font-size: .7rem;
padding: 0 0 .6rem; padding: 0 .2rem .6rem .2rem;
color: #929396; color: #929396;
text-transform: uppercase; text-transform: uppercase;
font-weight: 500; font-weight: 500;
display: block;
} }
.create-tab a:hover, .tab-container:hover a {
.create-tab a:focus { color: #7A8C9E;
border-bottom: 3px solid #929396;
} }
.create-tab a.selected, .tab-container.selected,
.create-tab a:active { .tab-container:active {
font-weight: 600; border-bottom: 3px solid #4B6178;
}
.tab-container.selected a {
color: #2C3E50; color: #2C3E50;
border-bottom: 3px solid #2C3E50; font-weight: 600;
} }
/* removes 300ms in IE */ /* removes 300ms in IE */