Merge pull request #2790 from bechi/add-colours

Add colours
This commit is contained in:
Matias Alejo Garcia 2015-05-29 15:31:21 -03:00
commit ace6c0c248
4 changed files with 11 additions and 8 deletions

View file

@ -382,7 +382,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] || '#7A8C9E';
self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
};

View file

@ -4,14 +4,17 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
function($scope, configService, profileService, go) {
var config = configService.getSync();
this.colorOpts = [
'#7A8C9E',
'#F38F12',
'#F4D03F',
'#FAA77F',
'#FADA58',
'#9EDD72',
'#77DADA',
'#4A90E2',
'#484ED3',
'#9B59B6',
'#E856EF',
'#F883B4',
'#FF599E',
'#7A8C9E',
];
var fc = profileService.focusedClient;
@ -19,7 +22,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
var config = configService.getSync();
config.colorFor = config.colorFor || {};
this.color = config.colorFor[walletId] || '#7A8C9E';
this.color = config.colorFor[walletId] || '#4A90E2';
this.save = function(color) {
var self = this;

View file

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