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

Merge pull request #34 from nacardin/feature/topBarColor

Browse source 
Update headers and colors across app
This commit is contained in:
Matias Alejo Garcia 2016-09-01 15:44:31 -03:00 • committed by GitHub
commit edbab551b6
58 changed files with 206 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gruntfile.js
View file

@ -94,7 +94,7 @@ module.exports = function(grunt) {
},
files: [{
expand: true,
src: ['src/sass/*.scss'],
src: ['src/sass/main.scss'],
dest: './',
ext: '.css'
}]
@ -193,12 +193,6 @@ module.exports = function(grunt) {
src: 'bower_components/ionic/release/js/ionic.bundle.min.js',
dest: 'public/lib/'
},
ionic_css: {
expand: true,
flatten: true,
src: 'bower_components/ionic/release/css/ionic.min.css',
dest: 'public/css/'
},
linux: {
files: [{
expand: true,

6
public/views/activity.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>Recent Activity</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
<span translate>Close</span>
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

26
public/views/add.html
View file

@ -1,29 +1,29 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-view id="view-add">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Add wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>
<ion-list>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal">
<a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create.personal">
<h2 translate>Create new wallet</h2>
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
<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-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
<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-chevron-right icon-accessory"></i>
</ion-item>
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
</ion-list>
</ion-content>

7
public/views/amazon.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Gift cards</ion-nav-title>
@ -65,4 +65,3 @@
</div>
</ion-content>
</ion-view>

6
public/views/amount.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="$ionicGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="$ionicGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

4
public/views/backup.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

13
public/views/bitpayCard.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>BitPay Card</ion-nav-title>
@ -38,7 +38,7 @@
ng-submit="bitpayCard.authenticate()"
novalidate>
<div class="list">
<div class="card list">
<label class="item item-input item-stacked-label">
<span class="input-label">Email</span>
<input name="email"
@ -58,7 +58,7 @@
</label>
</div>
<input class="button button-block"
<input class="button button-block button-positive"
type="submit"
ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
value="Login">
@ -85,7 +85,7 @@
</label>
</div>
<input class="button button-block"
<input class="button button-block button-positive"
type="submit"
ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
value="Login">
@ -216,4 +216,3 @@
</div>
</ion-content>
</ion-view>

7
public/views/buyAmazon.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="amazon.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="amazon.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Buy</ion-nav-title>
@ -154,4 +154,3 @@
</ion-content>
</ion-view>

6
public/views/buyGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Buy</ion-nav-title>

6
public/views/buyandsell.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title translate>Buy and sell</ion-nav-title>

4
public/views/confirm.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

6
public/views/copayers.html
View file

@ -1,10 +1,10 @@
<ion-view ng-controller="copayersController">
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button" href ui-sref="tabs.home">
<i class="ion-arrow-left-c"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

6
public/views/glidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Glidera</ion-nav-title>

6
public/views/glideraUri.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.home">
Close
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Glidera</ion-nav-title>

8
public/views/join.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Join shared wallet' | translate}}</ion-nav-title>
@ -17,7 +17,7 @@
<form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
<div class="list">
<div class="card list">
<div class="row">
<div class="col">

7
public/views/modals/addressbook.html
View file

@ -1,8 +1,7 @@
<ion-modal-view ng-controller="addressbookModalController" ng-init="initAddressbook()">
<ion-header-bar align-title="center" class="bar-stable">
<button class="button button-clear button-positive"
ng-click="closeAddressbookModal()" translate>
Close
<ion-header-bar align-title="center" class="bar-royal">
<button class="button back-button" ng-click="closeAddressbookModal()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
<div class="h1 title">
<span ng-show="!addAddressbookEntry" translate>Addressbook</span>

2
public/views/modals/glidera-tx-details.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="glideraTxDetailsController">
<ion-header-bar align-title="center" class="bar-stable">
<ion-header-bar align-title="center" class="bar-royal">
<button class="button button-clear button-positive"
ng-click="cancel()">
Close

2
public/views/modals/scanner.html
View file

@ -1,5 +1,5 @@
<ion-modal-view ng-controller="scannerController" ng-init="init()">
<ion-header-bar align-title="center" class="bar-stable">
<ion-header-bar align-title="center" class="bar-royal">
<button ng-click="cancel()" class="button button-clear button-positive" translate>
Close
</button>

6
public/views/onboarding/backupWarning.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" href ui-sref="onboarding.backupRequest">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="onboarding.backupRequest">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

4
public/views/preferences.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesController" ng-init="init()">

6
public/views/preferencesAbout.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button button-stable no-border" ui-sref="tabs.settings">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.settings">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

4
public/views/preferencesAdvanced.html
View file

@ -1,8 +1,8 @@
<ion-view >
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Advanced Preferences' | translate}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>

4
public/views/preferencesAlias.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAliasController" >

4
public/views/preferencesAltCurrency.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAltCurrencyController" ng-init="init()" >

7
public/views/preferencesBitpayCard.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="bitpayCard.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="bitpayCard.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Preferences</ion-nav-title>
@ -16,4 +16,3 @@
</ul>
</ion-content>
</ion-view>

4
public/views/preferencesBwsUrl.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesBwsUrlController" >

4
public/views/preferencesColor.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesColorController" >

4
public/views/preferencesDeleteWallet.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content class="has-header" ng-controller="preferencesDeleteWalletController" >

4
public/views/preferencesDeleteWords.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesDeleteWordsController" >

4
public/views/preferencesEmail.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesEmailController" >

4
public/views/preferencesFee.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

7
public/views/preferencesGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Preferences</ion-nav-title>
@ -275,4 +275,3 @@
</ul>
</ion-content>
</ion-view>

4
public/views/preferencesHistory.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesHistory" ng-init="index.updatingTxHistory ? null : csvHistory()">

4
public/views/preferencesInformation.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesInformation" ng-init="init()">

4
public/views/preferencesLanguage.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLanguageController" ng-init="init()" >

4
public/views/preferencesLogs.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesLogs" ng-init="init()" >

4
public/views/preferencesUnit.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesUnitController" ng-init="init()" >

6
public/views/sellGlidera.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="glidera.main">
<i class="icon ion-chevron-left"></i> Back
<button class="button back-button" ui-sref="glidera.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Sell</ion-nav-title>

8
public/views/tab-create-personal.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
@ -16,7 +16,7 @@
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="list">
<div class="card list">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet name</span>
<input type="text"

8
public/views/tab-create-shared.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.add">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ui-sref="tabs.add">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Create new wallet' | translate}}</ion-nav-title>
@ -16,7 +16,7 @@
<form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="list">
<div class="card list">
<label ng-hide="create.hideWalletName" class="item item-input item-stacked-label">
<span class="input-label" translate>Wallet name</span>
<input type="text"

8
public/views/tab-export-file.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
</button>
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

8
public/views/tab-export-qrCode.html
View file

@ -1,10 +1,10 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Export Wallet' | translate}}</ion-nav-title>
<ion-nav-buttons side="primary">
<button class="button no-border" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
</button>
<button class="button back-button" ui-sref="tabs.preferences.preferencesAdvanced">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>

25
public/views/tab-home.html
View file

@ -1,27 +1,22 @@
<ion-view id="tab-home">
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Home' | translate}}</ion-nav-title>
</ion-nav-bar>
<ion-content class="padding" ng-controller="tabHomeController" ng-init="updateAllWallets(); nextStep()">
<div class="card">
<div class="item item-divider item-icon-right" translate>
<div class="list card" ng-hide="!notifications[0]">
<a class="item item-icon-right item-heading" ui-sref="activity" translate>
Recent Activity
<i class="icon ion-ios-arrow-right" ui-sref="activity"></i>
</div>
<div ng-if="fetchingNotifications" class="item text-center">
<i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
</a>
<span ng-if="fetchingNotifications" class="item text-center">
<ion-spinner icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div>
</div>
<div ng-if="!fetchingNotifications">
<a class="item" ng-repeat="x in notifications" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
<div class="item" ng-show="!notifications[0]">
<span translate>Nothing to show here.</span>
</div>
</div>
</span>
<a ng-if="!fetchingNotifications" class="item" ng-repeat="x in notifications" ng-click="x.action()">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
</div>
<div class="list card" ng-hide="!wallets[0]">

18
public/views/tab-import-file.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
@ -16,7 +16,7 @@
<form name="importForm" ng-submit="importBlob(importForm)" novalidate>
<div class="list">
<div class="list card">
<label class="item item-input item-stacked-label no-border" ng-show="!isSafari && !isCordova">
<div class="input-label" translate>Choose a backup file from your computer</div>
@ -36,9 +36,9 @@
<label class="item item-input item-stacked-label">
<span class="input-label" translate>Password</span>
<input type="password"
placeholder="{{'Your password'|translate}}"
name="password"
ng-model="password">
placeholder="{{'Your password'|translate}}"
name="password"
ng-model="password">
</label>
<ion-toggle ng-model="showAdv" toggle-class="toggle-stable">
@ -56,9 +56,7 @@
</div>
</div>
<button type="submit"
class="button round expand black"
ng-disabled="importForm.$invalid || !password " translate>
<button type="submit" class="button button-block button-positive" ng-disabled="importForm.$invalid || !password " translate>
Import backup
</button>
</form>

8
public/views/tab-import-hardware.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>{{'Import wallet' | translate}}</ion-nav-title>
@ -23,7 +23,7 @@
</div>
<div ng-show="seedOptions[0]">
<div class="list">
<div class="card list">
<label class="item item-input item-select">
<div class="input-label" translate>

12
public/views/tab-import-phrase.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable" ng-controller="backController">
<ion-nav-bar class="bar-royal" ng-controller="backController">
<ion-nav-buttons side="primary">
<button class="button no-border" ng-click="importGoBack()">
<i class="icon ion-chevron-left"></i> {{'Back' | translate}}
<button class="button back-button" ng-click="importGoBack()">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-title>Import wallet</ion-nav-title>
@ -29,7 +29,7 @@
</div>
<form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
<div class="list">
<div class="list card">
<div class="row">
<div class="col col-90">
@ -83,8 +83,8 @@
</div>
<button type="submit"
class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button>
class="button button-block button-positive"
ng-disabled="importForm12.$invalid" translate>Import</button>
</form>
</ion-content>
</ion-view>

2
public/views/tab-receive.html
View file

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
</ion-nav-bar>

2
public/views/tab-scan.html
View file

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Scan' | translate}}</ion-nav-title>
</ion-nav-bar>

2
public/views/tab-send.html
View file

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Send' | translate}}</ion-nav-title>
</ion-nav-bar>

2
public/views/tab-settings.html
View file

@ -1,5 +1,5 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Global Settings' | translate}}</ion-nav-title>
</ion-nav-bar>

4
public/views/termsOfUse.html
View file

@ -1,7 +1,7 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

4
public/views/translators.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Translators' | translate}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content>

4
public/views/walletDetails.html
View file

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-stable">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{wallet.name}}</ion-nav-title>
<ion-nav-back-button>
{{'Back' | translate}}
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
</ion-nav-bar>

16
src/sass/views/common.scss → src/sass/common.scss
View file

@ -25,3 +25,19 @@
box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3);
}
}
.back-button {
border: 0;
.icon:before {
color: #fff;
font-size: 30px !important;
font-weight: bold;
margin-left: 5px;
}
}
.button-block {
width: 90% !important;
margin-left: auto;
margin-right: auto;
}

9
src/sass/ionic.scss Normal file
View file

@ -0,0 +1,9 @@
/* Set ionic variables */
$font-family-sans-serif: "Roboto", sans-serif;
$font-family-light-sans-serif: "Roboto-Light", sans-serif-light;
$royal: #1e3186;
$base-background-color: #f5f5f5;
@import "../../bower_components/ionic/scss/ionic";

8
src/sass/main.scss
View file

@ -1003,8 +1003,10 @@ input[type=number] {
}
}
@import "ionic";
@import "common";
@import 'mixins/mixins';
@import 'views/onboarding/onboarding';
@import "views/common";
@import "views/add";
@import "views/tab-home";
@import "views/includes/walletActivity";
@import 'views/onboarding/onboarding';
@import "views/includes/walletActivity";

13
src/sass/views/add.scss Normal file
View file

@ -0,0 +1,13 @@
#view-add {
.item {
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
&:first-child {
margin-top: 25px;
}
}
}

4
src/sass/views/tab-home.scss
View file

@ -19,4 +19,8 @@
background-repeat: no-repeat;
background-position: -5px -6px;
}
a.item {
color: #444;
}
}