Simplify menu. Fix contacts color

This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-02 18:20:22 -03:00
commit b20654d6f5
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
5 changed files with 126 additions and 130 deletions

View file

@ -653,12 +653,6 @@ input[type=number]::-webkit-outer-spin-button {
.label.alert {background-color: #ED4A43;}
.label.gray {background-color: #4B6178;}
.history .label {
width: 57px;
text-align: center;
font-size: 65%;
}
.bg-alert {
background-color: #ED4A43;
}

View file

@ -20,26 +20,22 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
self.menu = [{
'title': gettext('Home'),
'icon': 'icon-home',
'link': 'walletHome'
}, {
'title': gettext('Receive'),
'icon': 'icon-receive2',
'link': 'receive'
}, {
'title': gettext('Home'),
'icon': 'icon-home',
'link': 'walletHome'
}, {
'title': gettext('Send'),
'icon': 'icon-paperplane',
'link': 'send'
}, {
'title': gettext('History'),
'icon': 'icon-history',
'link': 'history'
}];
self.addonViews = addonManager.addonViews();
self.menu = self.menu.concat(addonManager.addonMenuItems());
self.menuItemSize = self.menu.length > 5 ? 2 : 3;
self.menuItemSize = self.menu.length > 4 ? 2 : 4;
self.txTemplateUrl = addonManager.txTemplateUrl() || 'views/includes/transaction.html';
self.tab = 'walletHome';

View file

@ -126,6 +126,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.selectedAddressbook = {};
$scope.newAddress = address;
$scope.walletName = fc.credentials.walletName;
$scope.color = fc.backgroundColor;
$scope.addressbook = {
'address': ($scope.newAddress || ''),
'label': ''
@ -688,7 +689,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
// on touchdown elements
$log.debug('Binding touchstart elements...');
['hamburger', 'menu-walletHome', 'menu-send', 'menu-receive', 'menu-history'].forEach(function(id) {
['hamburger', 'menu-walletHome', 'menu-send', 'menu-receive'].forEach(function(id) {
var e = document.getElementById(id);
if (e) e.addEventListener('touchstart', function() {
try {