diff --git a/Gruntfile.js b/Gruntfile.js index 14a621b13..005e0e602 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -78,7 +78,6 @@ module.exports = function(grunt) { }, angular: { src: [ - 'bower_components/fastclick/lib/fastclick.js', 'bower_components/qrcode-generator/js/qrcode.js', 'bower_components/qrcode-decoder-js/lib/qrcode-decoder.js', 'bower_components/moment/min/moment-with-locales.js', diff --git a/bower.json b/bower.json index 87666e046..d90c214cb 100644 --- a/bower.json +++ b/bower.json @@ -21,7 +21,6 @@ "angular-bitcore-wallet-client": "^0.0.18", "angular-ui-router": "~0.2.13", "qrcode-decoder-js": "*", - "fastclick": "*", "angular-ui-switch": "~0.1.0" }, "resolutions": { diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html index d1cf44609..f9d0c767d 100644 --- a/public/views/includes/menu.html +++ b/public/views/includes/menu.html @@ -1,8 +1,7 @@
- +
{{item.title|translate}} diff --git a/public/views/walletHome.html b/public/views/walletHome.html index ac397e499..407ca21d9 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -338,6 +338,8 @@ history -->
+ +
@@ -401,6 +403,7 @@ history
+
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 3ca87ad9d..4536f0f60 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -13,7 +13,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.menu = [{ 'title': 'Home', 'icon': 'icon-home', - 'link': 'walletHome' + 'link': 'walletHome', + 'active': true, }, { 'title': 'Receive', 'icon': 'icon-receive', @@ -105,6 +106,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setTab = function(tab) { document.getElementById(self.tab).className='tab-out tab-view ' + self.tab; document.getElementById(tab).className='tab-in tab-view ' + tab; + + var old =document.getElementById('menu-'+self.tab); + old.className=''; + old.style.borderTopColor = ''; + + var newe = document.getElementById('menu-'+tab); + newe.className='active'; + newe.style.borderTopColor = self.backgroundColor; + self.tab = tab; };