mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #322 from cmgustavo/bug/01-signin-message
Bug/01 signin message / green boxes
This commit is contained in:
commit
ffdaa86c21
|
@ -288,10 +288,14 @@ hr { margin: 2.25rem 0;}
|
||||||
}
|
}
|
||||||
.online {
|
.online {
|
||||||
background-color: black;
|
background-color: black;
|
||||||
border: 3px solid green;
|
border: 3px solid #1ABC9C;
|
||||||
|
}
|
||||||
|
.online:hover {
|
||||||
|
border-color: #16A085;
|
||||||
}
|
}
|
||||||
.offline {
|
.offline {
|
||||||
border: 3px solid gray;
|
border: 3px solid gray;
|
||||||
|
opacity: 0.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tx-copayers {
|
.tx-copayers {
|
||||||
|
|
|
@ -140,7 +140,12 @@ a.box-backup:hover i, a.box-backup:hover p {
|
||||||
color: #FBE500;
|
color: #FBE500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.alert-box.warning, .alert-box.error {
|
.alert-box.success {
|
||||||
|
background-color: #1ABC9C;
|
||||||
|
border-color: #16A085;
|
||||||
|
}
|
||||||
|
|
||||||
|
.alert-box.error {
|
||||||
background-color: #C0392A;
|
background-color: #C0392A;
|
||||||
border-color: #C0392A;
|
border-color: #C0392A;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
|
BIN
img/loading.gif
BIN
img/loading.gif
Binary file not shown.
Before Width: | Height: | Size: 529 B |
|
@ -147,7 +147,7 @@
|
||||||
<div class="signin" ng-controller="SigninController">
|
<div class="signin" ng-controller="SigninController">
|
||||||
<div data-alert class="alert-box info radius" ng-show="loading">
|
<div data-alert class="alert-box info radius" ng-show="loading">
|
||||||
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
|
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
Looking for peers...
|
Authenticating and Looking for peers...
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="!loading">
|
<div ng-show="!loading">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -486,10 +486,10 @@
|
||||||
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
|
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-hide="showScanner">
|
<div class="small-2 columns" ng-hide="showScanner">
|
||||||
<a class="postfix button" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
<a class="postfix button secondary" ng-click="openScanner()"><i class="fi-camera"></i></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="small-2 columns" ng-show="showScanner">
|
<div class="small-2 columns" ng-show="showScanner">
|
||||||
<a class="postfix button alert" ng-click="cancelScanner()">Cancel</a>
|
<a class="postfix button warning" ng-click="cancelScanner()">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="scanner" class="row" ng-if="showScanner">
|
<div id="scanner" class="row" ng-if="showScanner">
|
||||||
|
|
|
@ -31,6 +31,7 @@ angular.module('copay.signin').controller('SigninController',
|
||||||
if (!w) {
|
if (!w) {
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
$rootScope.flashMessage = { message: 'Bad password or connection error', type: 'error'};
|
$rootScope.flashMessage = { message: 'Bad password or connection error', type: 'error'};
|
||||||
|
$rootScope.$digest();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
controllerUtils.startNetwork(w);
|
controllerUtils.startNetwork(w);
|
||||||
|
|
|
@ -72,7 +72,7 @@ angular.module('copay.directives')
|
||||||
var text = attr.loading;
|
var text = attr.loading;
|
||||||
scope.$watch('loading', function(val) {
|
scope.$watch('loading', function(val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
element.html('<img src="img/loading.gif"> ' + text + '...');
|
element.html('<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i> ' + text + '...');
|
||||||
} else {
|
} else {
|
||||||
element.html(a);
|
element.html(a);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue