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

Merge pull request #2696 from bechi/sidebar-color1

Browse source 
change color for sidebar
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-11 14:18:14 -03:00
commit e973d4cfa0
7 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/index.js
View file

@ -123,7 +123,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var old = document.getElementById('menu-' + self.tab);
if (old) {
old.className = '';
old.style.borderTopColor = '';
}
}
@ -132,7 +131,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
var newe = document.getElementById('menu-' + tab);
if (newe) {
newe.className = 'active';
newe.style.borderTopColor = self.backgroundColor;
}
}
@ -340,7 +338,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateColor = function() {
var config = configService.getSync();
config.colorFor = config.colorFor || {};
self.backgroundColor = config.colorFor[self.walletId] || '#2C3E50';
self.backgroundColor = config.colorFor[self.walletId] || '#7A8C9E';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
};

4
src/js/controllers/preferencesColor.js
View file

@ -11,7 +11,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
'#9B59B6',
'#E856EF',
'#F883B4',
'#2C3E50',
'#7A8C9E',
];
var fc = profileService.focusedClient;
@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
var config = configService.getSync();
config.colorFor = config.colorFor || {};
this.color = config.colorFor[walletId] || '#2C3E50';
this.color = config.colorFor[walletId] || '#7A8C9E';
this.save = function(color) {
var self = this;

2
src/js/controllers/sidebar.js
View file

@ -41,7 +41,7 @@ angular.module('copayApp.controllers').controller('sidebarController',
n: c.n,
name: c.walletName,
id: c.walletId,
color: config.colorFor[c.walletId] || '#2C3E50',
color: config.colorFor[c.walletId] || '#7A8C9E',
};
});
self.wallets = lodash.sortBy(ret, 'walletName');

6
src/js/services/notificationsService.js
View file

@ -26,15 +26,15 @@ angular.module('copayApp.services')
if (!last) return false;
// rules...
if (last.type === 'NewTxProposal'
if (last.type === 'NewTxProposal'
&& notificationData.type === 'TxProposalAcceptedBy')
return true;
if (last.type === 'TxProposalFinallyAccepted'
if (last.type === 'TxProposalFinallyAccepted'
&& notificationData.type === 'NewOutgoingTx')
return true;
if (last.type === 'TxProposalRejectedBy'
if (last.type === 'TxProposalRejectedBy'
&& notificationData.type === 'TxProposalFinallyRejected')
return true;