add more colours

This commit is contained in:
bechi 2015-05-29 11:43:38 -03:00
parent ca2637af13
commit e95228e37b
4 changed files with 10 additions and 7 deletions

View File

@ -3,7 +3,7 @@
<a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet" <a id="hamburger" class="p10" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.openMenu()"><i class="fi-list size-24"></i> ng-click="index.openMenu()"><i class="fi-list size-24"></i>
</a> </a>
<a ng-show="goBackToState" <a ng-show="goBackToState"
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i> ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
<span class="text-back">{{'Back'|translate}}</span> <span class="text-back">{{'Back'|translate}}</span>
</a> </a>
@ -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 ? '#F38F12' : index.backgroundColor}">
{{(titleSection|translate) || (index.alias || index.walletName)}} {{(titleSection|translate) || (index.alias || index.walletName)}}
</h1> </h1>
</section> </section>

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] || '#F38F12';
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor; fc.backgroundColor = self.backgroundColor;
}; };

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;

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] || '#F38F12',
}; };
}); });
self.wallets = lodash.sortBy(ret, 'name'); self.wallets = lodash.sortBy(ret, 'name');