Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/settings_views_polish

# Conflicts:
#	public/views/preferencesLanguage.html
This commit is contained in:
Jamal Jackson 2016-09-22 15:08:53 -04:00
commit 64fb4a2e81
80 changed files with 608 additions and 502 deletions

View file

@ -12,7 +12,7 @@
</ion-nav-buttons>
</ion-nav-bar>
<ion-content ng-init="initAddressbook()">
<ion-content>
<div class="bar bar-header item-input-inset" ng-show="!isEmptyList">
<label class="item-input-wrapper">