Merge pull request #169 from cmgustavo/one-view-01

Fix wallethome
This commit is contained in:
Matias Alejo Garcia 2015-04-23 14:37:07 -03:00
commit 0e44e331e7
2 changed files with 92 additions and 97 deletions

View file

@ -1,7 +1,6 @@
<div class="home-wallet" ng-controller="walletHomeController as home"> <div ng-controller="walletHomeController as home">
<div class="oh" ng-show="!index.noFocusedWallet">
<div id="walletHome" class="walletHome tab-view tab-in"> <div id="walletHome" class="walletHome tab-view tab-in">
<div class="oh" ng-show="!index.noFocusedWallet">
<div class="amount" ng-style="{'background-color':index.backgroundColor}"> <div class="amount" ng-style="{'background-color':index.backgroundColor}">
<div ng-if="!index.anyOnGoingProcess && !index.notAuthorized"> <div ng-if="!index.anyOnGoingProcess && !index.notAuthorized">
<div ng-show="index.updateError" ng-click='index.openWallet()'> <div ng-show="index.updateError" ng-click='index.openWallet()'>
@ -15,14 +14,10 @@
</div> </div>
<div ng-show="!index.updateError && index.walletScanStatus != 'error'"> <div ng-show="!index.updateError && index.walletScanStatus != 'error'">
<div class="size-36 animated fadeIn"> <strong class="size-36">{{index.totalBalanceStr}}</strong>
<strong>{{index.totalBalanceStr}}</strong>
</div>
<div class="size-14" <div class="size-14"
ng-if="index.totalBalanceAlternative"> ng-if="index.totalBalanceAlternative">
<span ng-class="{'animated fadeIn':!index.hideBalance}">
{{index.totalBalanceAlternative}} {{index.alternativeIsoCode}} {{index.totalBalanceAlternative}} {{index.alternativeIsoCode}}
</span>
</div> </div>
</div> </div>
</div> </div>

View file

@ -172,11 +172,11 @@ _:-ms-fullscreen, :root .main {
height:100%; height:100%;
} }
.home-wallet { .walletHome {
background-color: #fff; background-color: #fff;
} }
.home-wallet .avatar-wallet { .walletHome .avatar-wallet {
padding: 1.7rem 1rem; padding: 1.7rem 1rem;
width: 75px; width: 75px;
height: 75px; height: 75px;
@ -193,7 +193,7 @@ _:-ms-fullscreen, :root .main {
border-radius: 5px; border-radius: 5px;
} }
.home-wallet .wallet-info { .walletHome .wallet-info {
margin-left: 85px; margin-left: 85px;
line-height: 110%; line-height: 110%;
float: left; float: left;