diff --git a/platforms/android b/platforms/android
index 6d0a924de888af6fb22e45e4f26ef81b319b0cca..eb7b86e9821819499ffa75ea972cca0cd321a639 160000
--- a/platforms/android
+++ b/platforms/android
@@ -1 +1 @@
-Subproject commit 6d0a924de888af6fb22e45e4f26ef81b319b0cca
+Subproject commit eb7b86e9821819499ffa75ea972cca0cd321a639
diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss
index 823a5c7b64a2fc505b1c76d5eeea57f5e4649d6c..d4e1233cd816457fdb8121d1253be05a437472ef 100644
--- a/scss/ionic.app.scss
+++ b/scss/ionic.app.scss
@@ -90,6 +90,9 @@ $screen-menu: $screen-sm;
@-ms-viewport {
width: 320px;
}
+ .no-padding-xxs {
+ padding: 0 !important;
+ }
}
// ----------------------------------
@@ -420,7 +423,7 @@ $screen-menu: $screen-sm;
}
.item-actions {
- min-height: 65px !important;
+ min-height: 55px !important;
}
.item-closeable:hover {
diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json
index 7c541cba2f8c5583e924afbe284500d2f20799c2..9ea00487514cc4e3458b76e17af5c2a77cc4281b 100644
--- a/www/i18n/locale-fr-FR.json
+++ b/www/i18n/locale-fr-FR.json
@@ -123,7 +123,7 @@
"BTN_ABOUT": "Ã propos",
"BTN_HELP": "Aide en ligne",
"REPORT_ISSUE": "anomalie",
- "NOT_YOUR_ACCOUNT_QUESTION" : "Vous n'êtes pas propriétaire du compte <b><i class=\"ion-key\"></i> {{pubkey|formatPubkey}}</b> ?",
+ "NOT_YOUR_ACCOUNT_QUESTION" : "Vous n'êtes pas propriétaire du compte <b class=\"ion-key\"> {{pubkey|formatPubkey}}</b> ?",
"BTN_CHANGE_ACCOUNT": "Déconnecter ce compte",
"CONNECTION_ERROR": "Nœud <b>{{server}}</b> injoignable ou adresse invalide.<br/><br/>Vérifiez votre connexion Internet, ou changer de nœud <a class=\"positive\" ng-click=\"doQuickFix('settings')\">dans les paramètres</a>.",
"SHOW_ALL_FEED": "Voir tout",
diff --git a/www/templates/home/home.html b/www/templates/home/home.html
index eef204bc4bd1c5a16baf477193d05c5c7cbbb840..61b5ff0f788c080b46109ad1d46afc4de6149ac1 100644
--- a/www/templates/home/home.html
+++ b/www/templates/home/home.html
@@ -13,7 +13,7 @@
<ion-content class="positive-900-bg circle-bg-dark">
- <div class="row no-padding-xs responsive-lg">
+ <div class="row padding-horizontal no-padding-xxs responsive-lg">
<div class="col col-30 no-padding hidden-xs hidden-sm"> </div>
<div class="col text-center no-padding-xs main-container">
@@ -56,12 +56,20 @@
ng-click="showJoinModal()" ng-if="!login" translate>LOGIN.CREATE_FREE_ACCOUNT</button>
<button type="button"
- class="item button button-block button-positive button-raised icon icon-left ion-person ink-dark"
+ class="item button button-block button-raised icon icon-left ion-person ink-dark"
+ ng-class="{'button-stable': smallscreen, 'button-positive': !smallscreen}"
ui-sref="app.view_wallet" ng-show="login" translate>MENU.ACCOUNT</button>
<button type="button"
- class="item button button-block button-positive button-raised icon icon-left ion-card ink-dark visible-xs"
- ui-sref="app.view_wallet_tx" ng-if="login" translate>MENU.TRANSACTIONS</button>
+ class="item button button-block button-stable button-raised icon icon-left ion-card ink-dark visible-xs"
+ ui-sref="app.view_wallet_tx" ng-if="login">
+ <b class="icon-secondary ion-clock" style="left: 52px; top: -2px; font-size: 10pt; display: block;"></b>
+ {{'MENU.TRANSACTIONS'|translate}}
+ </button>
+
+ <button type="button"
+ class="item button button-block button-positive button-raised icon icon-left ion-paper-airplane ink-dark visible-xs"
+ ng-click="showTransferModal()" ng-if="login" translate>COMMON.BTN_SEND_MONEY</button>
<br class="visible-xs visible-sm"/>
@@ -111,7 +119,7 @@
<div class="col col-30 no-padding" ng-if="feed">
<!-- feed -->
- <div class="feed padding padding-top">
+ <div class="feed padding-horizontal no-padding-xs padding-top">
<h3 class="padding-left">
<i class="icon ion-speakerphone"></i>
{{feed.title}}
@@ -124,7 +132,7 @@
<!-- feed items -->
<div class="animate-show-hide ng-hide" ng-show="feed">
<div ng-repeat="item in feed.items"
- class="card padding ">
+ class="card padding no-margin-xs">
<div class="header ">
<!-- author -->
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 14b32cebced3da7c5633585ec6ed5a97c00d6a77..0226a7f5a20b54af38fbe228977ef4dd8053423d 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -92,12 +92,41 @@
<i class="icon ion-arrow-expand dark" ng-class="{'ion-arrow-shrink': fullscreen}"></i>
</a>
<!-- endRemoveIf(device) -->
+
+
</div>
+
+
</ion-header-bar>
+
+
<ion-content scroll="false" class="scroll-content ionic-scroll" ng-class="{'overflow-scroll': smallscreen, 'scroll-content-false': !smallscreen}">
<ion-list class="list" ng-class="{'scroll': smallscreen}">
+ <!-- *************** -->
+ <!-- Actions section -->
+ <!-- *************** -->
+
+ <ion-item menu-close
+ class="item item-actions item-button-right visible-xs visible-sm"
+ ng-if="login"
+ ng-class="::{'item-button-left': $root.device.barcode.enable}">
+ <!-- transfer -->
+ <button
+ class="button button-positive ink-dark"
+ ng-click="showTransferModal()">
+ <i class="icon ion-paper-airplane"></i>
+ </button>
+
+ <!-- scan QR code -->
+ <button class="button button-stable ink"
+ ng-if="$root.device.barcode.enable"
+ ng-click="scanQrCodeAndGo()">
+ <i class="icon ion-qr-scanner"></i>
+ </button>
+ </ion-item>
+
<!-- ************ -->
<!-- Home section -->
<!-- ************ -->
@@ -133,19 +162,20 @@
active-link-path-prefix="#/app/history"
ui-sref="app.view_wallet_tx"
ng-class="{'item-menu-disable': !login}">
- <i class="icon ion-card"></i>
+ <i class="icon ion-clock" style="top: calc(100%/4); left: 25px; font-size: 10pt; display: block;"></i>
+ <b class="icon-secondary ion-card" style="top: calc(100%/2.5); left: 19px; font-size: 17pt; background-color: whitesmoke; width:17px; height: 14px;"></b>
{{:locale:'MENU.TRANSACTIONS'|translate}}
</a>
<a id="helptip-menu-btn-tx"></a>
<a menu-close
- class="item item-icon-left "
+ class="item item-icon-left"
active-link="active"
active-link-path-prefix="#/app/wallets"
ui-sref="app.view_wallets"
ng-class="{'item-menu-disable': !login}">
- <i class="icon ion-card " style="top: -5px; left: 22px; font-size: 18px;"></i>
- <i class="icon-secondary ion-card" style="top: 22px; left: 19px; font-size: 20px; background-color: white; width:17px; height: 14px;"></i>
+ <i class="icon ion-card " style="top: calc(100%/5); left: 22px; font-size: 16pt; display: block;"></i>
+ <i class="icon-secondary ion-card" style="top: 20px; left: 19px; font-size: 16pt; background-color: whitesmoke; width:17px; height: 14px;"></i>
{{:locale:'MENU.WALLETS'|translate}}
</a>
<a id="helptip-menu-btn-wallets"></a>
@@ -155,32 +185,19 @@
<!-- Allow extension here -->
<cs-extension-point name="menu-user"></cs-extension-point>
-
<!-- *************** -->
<!-- Actions section -->
<!-- *************** -->
- <div class="item item-divider" ng-if="login"></div>
- <ion-item menu-close class="item item-actions item-button-right" ng-if="login"
- ng-class="::{'item-button-left': $root.device.barcode.enable}">
+ <ion-item class="item hidden-xs hidden-sm">
<!-- transfer -->
- <button
- class="button button-positive ink-dark"
- ng-click="showTransferModal()"
- title="{{:locale:'COMMON.BTN_SEND_MONEY'|translate}}">
- <i class="icon ion-paper-airplane"></i>
- </button>
-
- <!-- scan QR code -->
- <button class="button button-stable ink"
- ng-if="$root.device.barcode.enable"
- ng-click="scanQrCodeAndGo()">
- <i class="icon ion-qr-scanner"></i>
+ <button class="button button-block button-small button-small-padding button-stable icon-left icon ion-paper-airplane no-margin"
+ ng-class="{'button-positive': login}"
+ ng-click="showTransferModal()">
+ {{:locale:'COMMON.BTN_SEND_MONEY'|translate}}
</button>
</ion-item>
- <cs-extension-point name="menu-actions"></cs-extension-point>
-
<!-- Spacer (large screen only) -->
<div class="item-spacer"></div>