diff --git a/src/css/mobile.css b/src/css/mobile.css
index d8e168f9f..dc2abf712 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -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;
@@ -216,6 +218,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;
@@ -243,12 +258,6 @@ ul.copayer-list img {
background-color: #213140;
}
-
-
-.right-small a, .left-small a {
- color: #A5B2BF;
-}
-
a.missing-copayers {
bottom: -34px;
text-align: center;
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index d3596848d..155e4a883 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -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');
};
diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js
index 20b508f9a..87024f2e4 100644
--- a/src/js/controllers/glidera.js
+++ b/src/js/controllers/glidera.js
@@ -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;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 6d640e878..6f16da028 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -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) {
diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js
index a2859db05..616892aa7 100644
--- a/src/js/controllers/sellGlidera.js
+++ b/src/js/controllers/sellGlidera.js
@@ -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');
};
diff --git a/src/js/controllers/topbar.js b/src/js/controllers/topbar.js
index cf8114c85..b3f58ad0e 100644
--- a/src/js/controllers/topbar.js
+++ b/src/js/controllers/topbar.js
@@ -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();
+ };
+
});
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 9fde92b99..1163521b8 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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();
@@ -123,7 +131,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
'address': ($scope.newAddress || ''),
'label': ''
};
- $scope.color = fc.backgroundColor;
$scope.beforeQrCodeScann = function() {
$scope.error = null;