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

Merge pull request #2790 from bechi/add-colours

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
public/views/includes/topbar.html
View file

@ -20,7 +20,7 @@
</section> </section>
<section class="middle tab-bar-section"> <section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color': noColor ? '#7A8C9E' : index.backgroundColor}"> <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4A90E2' : index.backgroundColor}">
{{(titleSection|translate) || (index.alias || index.walletName)}} {{(titleSection|translate) || (index.alias || index.walletName)}}
</h1> </h1>
</section> </section>

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

@ -382,7 +382,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateColor = function() { self.updateColor = function() {
var config = configService.getSync(); var config = configService.getSync();
config.colorFor = config.colorFor || {}; config.colorFor = config.colorFor || {};
self.backgroundColor = config.colorFor[self.walletId] || '#7A8C9E'; self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor; fc.backgroundColor = self.backgroundColor;
}; };

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

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

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

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