From e95228e37b203355d9d8616ad341b059853b64bb Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 29 May 2015 11:43:38 -0300 Subject: [PATCH] add more colours --- public/views/includes/topbar.html | 4 ++-- src/js/controllers/index.js | 2 +- src/js/controllers/preferencesColor.js | 9 ++++++--- src/js/controllers/sidebar.js | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html index ed8a93980..bad9082ed 100644 --- a/public/views/includes/topbar.html +++ b/public/views/includes/topbar.html @@ -3,7 +3,7 @@ - {{'Back'|translate}} @@ -20,7 +20,7 @@
-

+

{{(titleSection|translate) || (index.alias || index.walletName)}}

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index ff69df286..d11a7bf89 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -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] || '#F38F12'; var fc = profileService.focusedClient; fc.backgroundColor = self.backgroundColor; }; diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js index d01a878fb..8db918886 100644 --- a/src/js/controllers/preferencesColor.js +++ b/src/js/controllers/preferencesColor.js @@ -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; diff --git a/src/js/controllers/sidebar.js b/src/js/controllers/sidebar.js index 43dc61242..6aae05e1f 100644 --- a/src/js/controllers/sidebar.js +++ b/src/js/controllers/sidebar.js @@ -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] || '#F38F12', }; }); self.wallets = lodash.sortBy(ret, 'name');