Merge pull request #201 from jamal-jackson/feature/home_views_polish
Feature/home views polish
This commit is contained in:
commit
ded5ec645f
2 changed files with 28 additions and 19 deletions
|
|
@ -4,7 +4,7 @@
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content class="padding">
|
<ion-content class="padding">
|
||||||
<div class="list card homeTip" ng-show="homeTip">
|
<div class="list card homeTip" ng-if="homeTip">
|
||||||
<div class="item item-icon-right item-heading">
|
<div class="item item-icon-right item-heading">
|
||||||
<a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
<a ng-click="hideHomeTip()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -25,8 +25,7 @@
|
||||||
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
|
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
|
||||||
Payment Proposals
|
Payment Proposals
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
|
<span class="badge badge-assertive" ng-if="txpsN>3" translate> {{txpsN}}</span>
|
||||||
<span class="badge badge-assertive m5t m10r" ng-show="txpsN>3" translate> {{txpsN}}</span>
|
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
||||||
|
|
@ -61,24 +60,24 @@
|
||||||
</i>
|
</i>
|
||||||
<h2>
|
<h2>
|
||||||
{{wallet.name || wallet.id}}
|
{{wallet.name || wallet.id}}
|
||||||
<span class="size-12 text-light" ng-show="wallet.n > 1">
|
<span class="size-12 text-light" ng-if="wallet.n > 1">
|
||||||
{{wallet.m}}-of-{{wallet.n}}
|
{{wallet.m}}-of-{{wallet.n}}
|
||||||
</span>
|
</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<span ng-show="!wallet.isComplete()" class="assertive" translate>
|
<span ng-if="!wallet.isComplete()" class="assertive" translate>
|
||||||
Incomplete
|
Incomplete
|
||||||
</span>
|
</span>
|
||||||
<div ng-show="wallet.isComplete()">
|
<div ng-if="wallet.isComplete()">
|
||||||
<span ng-show="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
|
||||||
<span ng-show="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<a ui-sref="bitpayCard.main"
|
<a ui-sref="bitpayCard.main"
|
||||||
ng-show="externalServices.BitpayCard"
|
ng-if="externalServices.BitpayCard"
|
||||||
class="item item-icon-left item-big-icon-left item-icon-right">
|
class="item item-icon-left item-big-icon-left item-icon-right">
|
||||||
<i class="icon big-icon-svg">
|
<i class="icon big-icon-svg">
|
||||||
<div class="bg icon-bitpay-card"></div>
|
<div class="bg icon-bitpay-card"></div>
|
||||||
|
|
@ -89,22 +88,22 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
|
<div class="list card" ng-if="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
|
||||||
<div class="item item-icon-right item-heading" translate>
|
<div class="item item-icon-right item-heading" translate>
|
||||||
Buy & Sell Bitcoin
|
Buy & Sell Bitcoin
|
||||||
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<a ng-show="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
|
<a ng-if="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
|
||||||
<img src="img/glidera-logo.png" width="90"/>
|
<img src="img/glidera-logo.png" width="90"/>
|
||||||
<i class="icon nav-item-arrow-right"></i>
|
<i class="icon nav-item-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<!-- disable coinbase for this release -->
|
<!-- disable coinbase for this release -->
|
||||||
<!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
|
<!-- <a ng-if="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
|
||||||
<img src="img/coinbase-logo.png" width="90"> TODO
|
<img src="img/coinbase-logo.png" width="90"> TODO
|
||||||
</a> -->
|
</a> -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card" ng-show="externalServices.AmazonGiftCards">
|
<div class="list card" ng-if="externalServices.AmazonGiftCards">
|
||||||
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
|
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
|
||||||
<i class="icon big-icon-svg">
|
<i class="icon big-icon-svg">
|
||||||
<div class="bg icon-gift"></div>
|
<div class="bg icon-gift"></div>
|
||||||
|
|
@ -115,13 +114,13 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="list card"
|
<div class="list card"
|
||||||
ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
|
ng-if="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
|
||||||
<div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
|
<div class="item item-icon-right item-heading" ng-click="shouldHideNextSteps()" translate>
|
||||||
Next steps
|
Next steps
|
||||||
<i class="icon nav-item-arrow-down" ng-show="!hideNextSteps"></i>
|
<i class="icon nav-item-arrow-down" ng-if="!hideNextSteps"></i>
|
||||||
<i class="icon nav-item-arrow-up" ng-show="hideNextSteps"></i>
|
<i class="icon nav-item-arrow-up" ng-if="hideNextSteps"></i>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="hideNextSteps">
|
<div ng-if="hideNextSteps">
|
||||||
<a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
<a ng-if="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
|
||||||
<i class="icon big-icon-svg">
|
<i class="icon big-icon-svg">
|
||||||
<div class="bg icon-create-wallet"></div>
|
<div class="bg icon-create-wallet"></div>
|
||||||
|
|
|
||||||
|
|
@ -26,14 +26,24 @@
|
||||||
top:0;
|
top:0;
|
||||||
right:0;
|
right:0;
|
||||||
content:'';
|
content:'';
|
||||||
|
@media (min-width: 450px){
|
||||||
|
&{
|
||||||
|
width:90%;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&.item-heading{
|
&.item-heading{
|
||||||
&:before{
|
&:before{
|
||||||
width:100%;
|
width:100% !important;
|
||||||
top:99%
|
top:99%
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&:nth-child(2){
|
&:nth-child(1){
|
||||||
|
&:before{
|
||||||
|
width:0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&:nth-child(2):last-child{
|
||||||
&:before{
|
&:before{
|
||||||
width:0;
|
width:0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue