fix colors
This commit is contained in:
parent
bd103fbd4f
commit
9f5d09f1cc
7 changed files with 19 additions and 8 deletions
|
|
@ -97,7 +97,7 @@ _:-ms-fullscreen, :root .main {
|
|||
}
|
||||
|
||||
.tab-bar h1 {
|
||||
color: #1ABC9C;
|
||||
color: #7A8C9E;
|
||||
font-weight: 500;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,13 @@ angular.module('copayApp.controllers').controller('preferencesController',
|
|||
isoCode: config.wallet.settings.alternativeIsoCode
|
||||
};
|
||||
var fc = profileService.focusedClient;
|
||||
$scope.encrypt = fc.hasPrivKeyEncrypted();
|
||||
if (fc)
|
||||
$scope.encrypt = fc.hasPrivKeyEncrypted();
|
||||
|
||||
var unwatch = $scope.$watch('encrypt', function(val) {
|
||||
var fc = profileService.focusedClient;
|
||||
if (!fc) return;
|
||||
|
||||
if (val && !fc.hasPrivKeyEncrypted()) {
|
||||
$rootScope.$emit('Local/NeedsPassword', true, function(err, password) {
|
||||
if (err || !password) {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
|
|||
function($scope, configService, profileService, go) {
|
||||
var config = configService.getSync();
|
||||
this.colorOpts = [
|
||||
'#7A8C9E',
|
||||
'#F38F12',
|
||||
'#F4D03F',
|
||||
'#4A90E2',
|
||||
|
|
@ -11,7 +12,6 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
|
|||
'#9B59B6',
|
||||
'#E856EF',
|
||||
'#F883B4',
|
||||
'#7A8C9E',
|
||||
];
|
||||
|
||||
var fc = profileService.focusedClient;
|
||||
|
|
|
|||
|
|
@ -356,6 +356,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
return;
|
||||
|
||||
var fc = profileService.focusedClient;
|
||||
if (!fc)
|
||||
return;
|
||||
|
||||
$timeout(function() {
|
||||
storageService.getLastAddress(fc.credentials.walletId, function(err, addr) {
|
||||
if (addr) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue