Merge pull request #69 from nacardin/feature/settings2

update styles for settings views
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-07 10:20:59 -03:00 committed by GitHub
commit 39ca6ec656
9 changed files with 82 additions and 80 deletions

View file

@ -12,17 +12,17 @@
<ion-list>
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create">
<h2 translate>Create new wallet</h2>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
<h2 translate>Join shared wallet</h2>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
<h2 translate>Import wallet</h2>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
</ion-list>

View file

@ -36,7 +36,7 @@
<a class="item item-icon-left item-icon-right" href ui-sref="amazon.buy">
<i class="icon ion-bag"></i>
Buy Gift Card
<i class="icon ion-ios-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>

View file

@ -90,7 +90,7 @@
<span class="item-note" ng-show="email">
{{email}}
</span>
<i class="icon ion-ios-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
<div class="padding">
@ -115,14 +115,14 @@
href ui-sref="glidera.buy">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="35">
Buy Bitcoin
<i class="icon ion-ios-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right"
ng-show="status.userCanSell"
href ui-sref="glidera.sell">
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="35">
Sell Bitcoin
<i class="icon ion-ios-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>

View file

@ -7,41 +7,41 @@
<ion-content ng-controller="preferencesController" ng-init="init()">
<div class="list">
<div class="item item-divider"></div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAlias">
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesAlias">
<span translate>Name</span>
<span class="item-note">
{{wallet.name}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item" ng-show="wallet.isPrivKeyExternal()">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item" ng-show="wallet.isPrivKeyExternal()">
<span translate>Hardware Wallet</span>
<span class="item-note">
{{wallet.externalSource}}
</span>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesColor">
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesColor">
<span translate>Color</span>
<span class="item-note" ng-style="{'color': wallet.color}">
&block;
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesEmail">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesEmail">
<span translate>Email Notifications</span>
<span class="item-note">
<span ng-if="!wallet.email" translate>Disabled</span>
<span ng-if="wallet.email">{{wallet.email}}</span>
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-divider" translate>
Security
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
<a class="item item-icon-right" ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
<span translate>Backup</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div ng-show="wallet.canSign()">
<ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
<span class="toggle-label" translate>Request Spending Password</span>
@ -52,15 +52,15 @@
<span class="toggle-label" translate>Request Fingerprint</span>
</ion-toggle>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.deleteWords" ng-show ="!deleted">
<a class="item item-icon-right" ui-sref="tabs.preferences.deleteWords" ng-show ="!deleted">
<span translate>Delete recovery phrase</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-divider"></div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesAdvanced">
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesAdvanced">
<span translate>Advanced</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
</ion-content>
</ion-view>

View file

@ -27,21 +27,21 @@
</div>
<div class="item item-divider">
</div>
<div class="item item-icon-left item-icon-right" href ui-sref="tabs.termsOfUse">
<a class="item item-icon-left item-icon-right" ui-sref="tabs.termsOfUse">
<i class="icon ion-ios-list-outline"></i>
<span translate>Terms of Use</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-left item-icon-right" href ui-sref="tabs.translators">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.translators">
<i class="icon ion-ios-people-outline"></i>
<span translate>Translators</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-left item-icon-right" href ui-sref="tabs.logs">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-left item-icon-right" ui-sref="tabs.logs">
<i class="icon ion-ios-copy-outline"></i>
<span translate>Session log</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
</ion-content>
</ion-view>

View file

@ -9,30 +9,30 @@
<div class="list">
<div class="item item-divider">
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.information">
<a class="item item-icon-right" ui-sref="tabs.preferences.information">
<span translate>Wallet Information</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" ng-show="index.network == 'livenet'" href ui-sref="tabs.preferences.paperWallet">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ng-show="index.network == 'livenet'" ui-sref="tabs.preferences.paperWallet">
<span translate>Sweep paper wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.export.file">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ui-sref="tabs.preferences.export.file">
<span translate>Export Wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesBwsUrl">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesBwsUrl">
<span translate>Wallet Service URL</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.preferencesHistory">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ui-sref="tabs.preferences.preferencesHistory">
<span translate>Transaction History</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<div class="item item-icon-right" href ui-sref="tabs.preferences.delete">
<i class="icon nav-item-arrow-right"></i>
</a>
<a class="item item-icon-right" ui-sref="tabs.preferences.delete">
<span translate>Delete Wallet</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
</ion-content>
</ion-view>

View file

@ -9,7 +9,7 @@
<div class="list card" ng-hide="!txps[0]">
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
Payment Proposals
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
<span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
</a>
@ -22,7 +22,7 @@
<div class="list card">
<a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
Recent Activity
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<span ng-if="fetchingNotifications" class="item text-center">
<ion-spinner icon="lines"></ion-spinner>
@ -57,7 +57,7 @@
<p ng-show="wallet.isComplete() && wallet.balanceHidden">
<strong class="size-12" translate>[Balance Hidden]</strong>
</p>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left">
<i class="icon ion-card"></i>
@ -92,28 +92,28 @@
<img class="icon-create-wallet"/>
</i>
<span translate>Create a bitcoin wallet</span>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<img class="icon-buy-bitcoin"/>
</i>
<span translate>Buy Bitcoin</span>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ui-sref="bitpayCard.main" ng-show="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<img class="icon-bitpay-card"/>
</i>
<span translate>Add BitPay Card</span>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ui-sref="amazon.main" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<img class="icon-gift"/>
</i>
<span translate>Add Amazon Gift Card</span>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>

View file

@ -6,48 +6,49 @@
<ion-content ng-controller="tabSettingsController" ng-init="init()">
<div class="list">
<div class="item item-divider"></div>
<div class="item item-icon-left" ng-click="openAddressbookModal()">
<a class="item item-icon-left item-icon-right" ng-click="openAddressbookModal()">
<i class="icon ion-ios-book-outline"></i>
<span translate>Address Book</span>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-divider" translate>Preferences</div>
<div class="item item-icon-left item-icon-right" ui-sref="tabs.language">
<a class="item item-icon-left item-icon-right" ui-sref="tabs.language">
<i class="icon ion-ios-chatbubble-outline"></i>
<span translate>Language</span>
<span class="item-note">
{{currentLanguageName|translate}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-icon-left item-icon-right" ui-sref="tabs.unit">
<a class="item item-icon-left item-icon-right" ui-sref="tabs.unit">
<i class="icon ion-ios-calculator-outline"></i>
<span translate>Unit</span>
<span class="item-note">
{{unitName}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-icon-left item-icon-right" ui-sref="tabs.altCurrency">
<a class="item item-icon-left item-icon-right" ui-sref="tabs.altCurrency">
<i class="icon ion-social-usd-outline"></i>
<span translate>Alternative Currency</span>
<span class="item-note">
{{selectedAlternative.name}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-icon-left item-icon-right" ui-sref="tabs.fee">
<a class="item item-icon-left item-icon-right" ui-sref="tabs.fee">
<i class="icon ion-social-bitcoin-outline"></i>
<span translate>Bitcoin Network Fee Policy</span>
<span class="item-note">
{{feeOpts[currentFeeLevel]|translate}}
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div ng-show="usePushNotifications && PNEnabledByUser">
<div class="item item-divider" translate>Notifications</div>
@ -84,7 +85,7 @@
</ion-toggle>
<div class="item item-divider" translate>Wallets Preferences</div>
<div class="item item-icon-left item-icon-right" href
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences.main({'walletId': item.id})"
ng-repeat="item in wallets track by $index">
<i class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i>
@ -95,15 +96,15 @@
<span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
Incomplete
</span>
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
<div class="item item-divider"></div>
<div class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
<i class="icon ion-ios-information-outline"></i>
<span translate>About</span> {{appName}}
<i class="icon ion-ios-arrow-right"></i>
</div>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
</ion-content>
</ion-view>

View file

@ -1,6 +1,7 @@
.icon.nav-item-arrow-right {
color: #666;
font-size: 26px;
@extend .ion-ios-arrow-right;
}
.item.item-heading {