Change top-bar color

This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 17:16:39 -03:00
commit 0c06a3d460
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
17 changed files with 60 additions and 76 deletions

View file

@ -90,13 +90,11 @@ _:-ms-fullscreen, :root .main {
}
.tab-bar {
background: #FFFFFF;
background-color: #4B6178;
z-index: 5;
border-bottom: 1px solid #E9E9EC;
}
.tab-bar h1 {
color: #7A8C9E;
font-weight: 500;
font-size: 14px;
}
@ -119,6 +117,10 @@ _:-ms-fullscreen, :root .main {
border-left: none;
}
.right-small a, .left-small a {
color: #FFFFFF;
}
.tab-bar .icon-back {
font-size: 2.5rem;
position: absolute;
@ -220,6 +222,19 @@ _:-ms-fullscreen, :root .main {
overflow: hidden;
}
.camera-icon a {
color: #fff;
display: block;
position: absolute;
background: #333;
border: 1px solid #666;
padding: 15px 17px;
border-radius: 100%;
top: -43px;
right: 15px;
opacity: 0.7;
}
.copayers {
position: relative;
padding: 0;
@ -247,12 +262,6 @@ ul.copayer-list img {
background-color: #213140;
}
.right-small a, .left-small a {
color: #A5B2BF;
}
a.missing-copayers {
bottom: -34px;
text-align: center;

View file

@ -42,6 +42,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.type = 'BUY';
$scope.wallets = wallets;
$scope.noColor = true;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};

View file

@ -42,6 +42,7 @@ angular.module('copayApp.controllers').controller('glideraController',
$scope.tx = tx;
$scope.settings = config;
$scope.color = fc.backgroundColor;
$scope.noColor = true;
glideraService.getTransaction(token, tx.transactionUuid, function(error, tx) {
$scope.tx = tx;

View file

@ -562,6 +562,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
if (isCordova && StatusBar.isVisible) {
StatusBar.backgroundColorByHexString(fc.backgroundColor);
}
};
self.setBalance = function(balance) {

View file

@ -48,6 +48,7 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.type = 'SELL';
$scope.wallets = wallets;
$scope.noColor = true;
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};

View file

@ -1,17 +1,13 @@
'use strict';
angular.module('copayApp.controllers').controller('topbarController', function($scope, $rootScope, go) {
this.onQrCodeScanned = function(data) {
$rootScope.$emit('dataScanned', data);
};
this.openSendScreen = function() {
go.send();
};
angular.module('copayApp.controllers').controller('topbarController', function(go) {
this.goHome = function() {
go.walletHome();
};
this.goPreferences = function() {
go.preferences();
};
});

View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService, animationService, addressbookService) {
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService, animationService, addressbookService, go) {
var self = this;
$rootScope.hideMenuBar = false;
@ -98,6 +98,14 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}
};
this.onQrCodeScanned = function(data) {
$rootScope.$emit('dataScanned', data);
};
this.openSendScreen = function() {
go.send();
};
rateService.whenAvailable(function() {
self.isRateAvailable = true;
$rootScope.$digest();
@ -122,7 +130,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
'address': ($scope.newAddress || ''),
'label': ''
};
$scope.color = fc.backgroundColor;
$scope.beforeQrCodeScann = function() {
$scope.error = null;