fix colors

This commit is contained in:
Matias Alejo Garcia 2015-05-13 12:41:05 -03:00
parent bd103fbd4f
commit 9f5d09f1cc
7 changed files with 19 additions and 8 deletions

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 ? '#4B6178' : index.backgroundColor}"> <h1 class="title ellipsis" ng-style="{'color': noColor ? '#7A8C9E' : index.backgroundColor}">
{{(titleSection|translate) || index.walletName}} {{(titleSection|translate) || index.walletName}}
</h1> </h1>
</section> </section>

View File

@ -8,14 +8,14 @@
<div class="content preferences" ng-controller="preferencesController as preferences"> <div class="content preferences" ng-controller="preferencesController as preferences">
<ul class="no-bullet m0 size-14"> <ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
<h4 class="title m0" translate>{{index.walletName}} settings</h4> <h4 class="title m0" translate>{{index.walletName}} settings</h4>
<li class="line-b p20" ng-click="$root.go('preferencesColor')"> <li class="line-b p20" ng-click="$root.go('preferencesColor')">
<span translate>Color</span> <span translate>Color</span>
<span class="right text-gray"> <span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i> <i class="icon-arrow-right3 size-24 right"></i>
<span ng-style="{'color':index.backgroundColor || '#1ABC9C'}">&block;</span> <span ng-style="{'color':index.backgroundColor}">&block;</span>
</span> </span>
</li> </li>
<li class="line-b p20"> <li class="line-b p20">
@ -23,7 +23,6 @@
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch> <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
</li> </li>
<h4 class="title m0">&nbsp;</h4> <h4 class="title m0">&nbsp;</h4>
<li class="line-b p20" ng-click="$root.go('backup')"> <li class="line-b p20" ng-click="$root.go('backup')">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
@ -33,6 +32,8 @@
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Advanced</span> <span translate>Advanced</span>
</li> </li>
</ul>
<ul class="no-bullet m0 size-14">
<h4 class="title m0" translate>Global settings</h4> <h4 class="title m0" translate>Global settings</h4>

View File

@ -10,6 +10,10 @@
<i class="fi-alert"></i> <span translate>You do not have any wallet</span> <i class="fi-alert"></i> <span translate>You do not have any wallet</span>
</div> </div>
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button> <button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
<button class=" outline dark-gray tiny" translate> Preferences </button>
</div>
</div> </div>
<div class="onGoingProcess" ng-show="index.isOffline"> <div class="onGoingProcess" ng-show="index.isOffline">
@ -457,4 +461,4 @@
</div> </div>
</div> </div>
<div class="extra-margin-bottom"></div> <div class="extra-margin-bottom"></div>
<div ng-include="'views/includes/menu.html'"></div> <div ng-include="'views/includes/menu.html'" ng-show="!index.noFocusedWallet"></div>

View File

@ -97,7 +97,7 @@ _:-ms-fullscreen, :root .main {
} }
.tab-bar h1 { .tab-bar h1 {
color: #1ABC9C; color: #7A8C9E;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
} }

View File

@ -10,10 +10,13 @@ angular.module('copayApp.controllers').controller('preferencesController',
isoCode: config.wallet.settings.alternativeIsoCode isoCode: config.wallet.settings.alternativeIsoCode
}; };
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
$scope.encrypt = fc.hasPrivKeyEncrypted(); if (fc)
$scope.encrypt = fc.hasPrivKeyEncrypted();
var unwatch = $scope.$watch('encrypt', function(val) { var unwatch = $scope.$watch('encrypt', function(val) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
if (!fc) return;
if (val && !fc.hasPrivKeyEncrypted()) { if (val && !fc.hasPrivKeyEncrypted()) {
$rootScope.$emit('Local/NeedsPassword', true, function(err, password) { $rootScope.$emit('Local/NeedsPassword', true, function(err, password) {
if (err || !password) { if (err || !password) {

View File

@ -4,6 +4,7 @@ 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', '#F4D03F',
'#4A90E2', '#4A90E2',
@ -11,7 +12,6 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
'#9B59B6', '#9B59B6',
'#E856EF', '#E856EF',
'#F883B4', '#F883B4',
'#7A8C9E',
]; ];
var fc = profileService.focusedClient; var fc = profileService.focusedClient;

View File

@ -356,6 +356,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
return; return;
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
if (!fc)
return;
$timeout(function() { $timeout(function() {
storageService.getLastAddress(fc.credentials.walletId, function(err, addr) { storageService.getLastAddress(fc.credentials.walletId, function(err, addr) {
if (addr) { if (addr) {