From 247fb41a901afccb2766c1ff1958967e4fff9580 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 16 Jan 2015 17:03:42 -0300 Subject: [PATCH 1/5] fix bugs when you have 0 wallets --- css/src/main.css | 2 +- views/includes/sidebar.html | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 3e3f0690a..824e9c039 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -1335,7 +1335,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .black { background-color: #2C3E50; } - +.text-italic {font-style: italic;} .text-light {font-weight: 100;} .text-bold {font-weight: 700;} .text-gray {color: #8597A7;} diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 08d986bb6..ad85a547c 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -1,17 +1,22 @@
-
-
-
{{$root.wallet.getName() | limitTo: 1}}
+
+
+ You have no wallets
-
-
-
-
{{$root.wallet.getName()}}
-
-
{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
+
+
+
{{$root.wallet.getName() | limitTo: 1}}
+
+
+
+
+
{{$root.wallet.getName()}}
+
+
{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}}
+
-
+
@@ -25,7 +30,7 @@
-
    +
    • Date: Sun, 18 Jan 2015 18:45:46 -0300 Subject: [PATCH 2/5] profile without wallet, redir to add page --- js/services/identityService.js | 2 +- views/includes/sidebar.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/js/services/identityService.js b/js/services/identityService.js index 9ae9c6983..96cf0ed19 100644 --- a/js/services/identityService.js +++ b/js/services/identityService.js @@ -298,7 +298,7 @@ angular.module('copayApp.services') iden.on('noWallets', function() { notification.warning('No Wallets', 'Your profile has no wallets. Create one here'); $rootScope.starting = false; - $location.path('/create'); + $location.path('/add'); $timeout(function() { $rootScope.$digest(); }, 1); diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index ad85a547c..01e7cb93f 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -32,6 +32,7 @@
      • Date: Sun, 18 Jan 2015 18:47:04 -0300 Subject: [PATCH 3/5] dont use shadow for mobile --- css/src/main.css | 2 +- css/src/mobile.css | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 824e9c039..3374c92cc 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -536,7 +536,7 @@ ul.tx-copayers { a.button-setup { border-radius: 3px; - border: 1px solid #E4E8EC; + border: 1px solid #ccc; display: block; padding: 0.5rem; background: transparent; diff --git a/css/src/mobile.css b/css/src/mobile.css index 8528b0876..f9b1f3e20 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -94,10 +94,7 @@ } header { - background-image: -webkit-linear-gradient(#2C3E50 0%, #1D2833 100%); - background-image: -o-linear-gradient(#2C3E50 0%, #1D2833 100%); - background-image: linear-gradient(#2C3E50 0%, #1D2833 100%); - box-shadow: 0px 1px 0px 0px #2C3E50, inset -1px 0px 0px 0px rgba(0,0,0,0.24); + background-color: #2C3E50; height: 120px; width: 100%; line-height: 110%; @@ -200,8 +197,8 @@ padding: 0.66667rem 1rem; color: #7A8C9E; border-top: 1px solid rgba(255,255,255,0.25); - -moz-box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15); - box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15); + -moz-box-shadow: none; + box-shadow: none; } ul.off-canvas-list li a i { From 1945d03a76fdcf0f85cadc482bf18834bb397d20 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 18 Jan 2015 18:48:16 -0300 Subject: [PATCH 4/5] display settings for small screens --- js/controllers/homeWallet.js | 4 +--- views/homeWallet.html | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index 849bfbb1f..a4efbe719 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -1,8 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService, isMobile) { - - $scope.isMobile = isMobile.any(); +angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) { $scope.openTxModal = function(tx) { var ModalInstanceCtrl = function($scope, $modalInstance) { diff --git a/views/homeWallet.html b/views/homeWallet.html index f724f1297..239d5b324 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -85,7 +85,7 @@
-
+
Settings
From 4f8f6fa122f93b581af4ed268a224aca8360ceb4 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 18 Jan 2015 18:50:56 -0300 Subject: [PATCH 5/5] disable button when click on it --- views/copayers.html | 13 ++++--------- views/more.html | 7 +------ views/profile.html | 7 +------ 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/views/copayers.html b/views/copayers.html index 14db0f488..2a09dcfea 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -50,11 +50,11 @@
-
- -
+

Are you sure you want to cancel and delete this wallet

@@ -63,12 +63,7 @@
diff --git a/views/more.html b/views/more.html index 136611381..2bcb1cccd 100644 --- a/views/more.html +++ b/views/more.html @@ -115,12 +115,7 @@
diff --git a/views/profile.html b/views/profile.html index 9d17bb5e6..96577c9a5 100644 --- a/views/profile.html +++ b/views/profile.html @@ -81,12 +81,7 @@