mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #14 from cmgustavo/bug/no-wallets01
Bug/no wallets01
This commit is contained in:
commit
2b96db8f2e
|
@ -536,7 +536,7 @@ ul.tx-copayers {
|
||||||
|
|
||||||
a.button-setup {
|
a.button-setup {
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
border: 1px solid #E4E8EC;
|
border: 1px solid #ccc;
|
||||||
display: block;
|
display: block;
|
||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
|
|
|
@ -94,10 +94,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
header {
|
header {
|
||||||
background-image: -webkit-linear-gradient(#2C3E50 0%, #1D2833 100%);
|
background-color: #2C3E50;
|
||||||
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);
|
|
||||||
height: 120px;
|
height: 120px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
line-height: 110%;
|
line-height: 110%;
|
||||||
|
@ -200,8 +197,8 @@
|
||||||
padding: 0.66667rem 1rem;
|
padding: 0.66667rem 1rem;
|
||||||
color: #7A8C9E;
|
color: #7A8C9E;
|
||||||
border-top: 1px solid rgba(255,255,255,0.25);
|
border-top: 1px solid rgba(255,255,255,0.25);
|
||||||
-moz-box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
|
-moz-box-shadow: none;
|
||||||
box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.off-canvas-list li a i {
|
ul.off-canvas-list li a i {
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService, isMobile) {
|
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) {
|
||||||
|
|
||||||
$scope.isMobile = isMobile.any();
|
|
||||||
|
|
||||||
$scope.openTxModal = function(tx) {
|
$scope.openTxModal = function(tx) {
|
||||||
var ModalInstanceCtrl = function($scope, $modalInstance) {
|
var ModalInstanceCtrl = function($scope, $modalInstance) {
|
||||||
|
|
|
@ -298,7 +298,7 @@ angular.module('copayApp.services')
|
||||||
iden.on('noWallets', function() {
|
iden.on('noWallets', function() {
|
||||||
notification.warning('No Wallets', 'Your profile has no wallets. Create one here');
|
notification.warning('No Wallets', 'Your profile has no wallets. Create one here');
|
||||||
$rootScope.starting = false;
|
$rootScope.starting = false;
|
||||||
$location.path('/create');
|
$location.path('/add');
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$rootScope.$digest();
|
$rootScope.$digest();
|
||||||
}, 1);
|
}, 1);
|
||||||
|
|
|
@ -50,11 +50,11 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- end of row -->
|
<!-- end of row -->
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns size-12">
|
<div class="large-12 columns">
|
||||||
<button class="warning" ng-show="!confirmDelete" ng-click="confirmDelete=!confirmDelete">
|
<button class="small warning" ng-show="!confirmDelete" ng-click="confirmDelete=!confirmDelete">
|
||||||
<i class="fi-trash"></i> Cancel
|
<i class="fi-trash"></i> Cancel
|
||||||
</button>
|
</button>
|
||||||
<div ng-show="confirmDelete">
|
<div class="text-center" ng-show="confirmDelete">
|
||||||
<h2>Are you sure you want to cancel and delete this wallet</h2>
|
<h2>Are you sure you want to cancel and delete this wallet</h2>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
|
@ -63,12 +63,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
||||||
<span ng-show="!loading">
|
<i class="fi-trash"></i> Yes
|
||||||
<i class="fi-trash"></i> Yes
|
|
||||||
</span>
|
|
||||||
<span ng-show="loading">
|
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" ng-show="isMobile">
|
<div class="row hide-for-large-up">
|
||||||
<div class="large-12 columns text-right size-12">
|
<div class="large-12 columns text-right size-12">
|
||||||
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
|
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
<div>
|
<div>
|
||||||
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}">
|
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}">
|
||||||
<li
|
<li
|
||||||
|
ng-if="wallets[0]"
|
||||||
ng-repeat="item in wallets track by $index"
|
ng-repeat="item in wallets track by $index"
|
||||||
class="nav-item"
|
class="nav-item"
|
||||||
ng-if="item.id != $root.wallet.id"
|
ng-if="item.id != $root.wallet.id"
|
||||||
|
|
|
@ -115,12 +115,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
|
||||||
<span ng-show="!loading">
|
<i class="fi-trash"></i> Delete
|
||||||
<i class="fi-trash"></i> Delete
|
|
||||||
</span>
|
|
||||||
<span ng-show="loading">
|
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -81,12 +81,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="large-6 medium-6 small-6 columns">
|
<div class="large-6 medium-6 small-6 columns">
|
||||||
<button class="warning" ng-disabled="loading" ng-click="deleteProfile()">
|
<button class="warning" ng-disabled="loading" ng-click="deleteProfile()">
|
||||||
<span ng-show="!loading">
|
<i class="fi-trash"></i> Delete
|
||||||
<i class="fi-trash"></i> Delete
|
|
||||||
</span>
|
|
||||||
<span ng-show="loading">
|
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue