Merge pull request #322 from cmgustavo/bug/01-signin-message

Bug/01 signin message / green boxes
This commit is contained in:
Manuel Aráoz 2014-05-08 15:02:06 -03:00
commit ffdaa86c21
6 changed files with 16 additions and 6 deletions

View File

@ -288,10 +288,14 @@ hr { margin: 2.25rem 0;}
}
.online {
background-color: black;
border: 3px solid green;
border: 3px solid #1ABC9C;
}
.online:hover {
border-color: #16A085;
}
.offline {
border: 3px solid gray;
opacity: 0.4;
}
.tx-copayers {

View File

@ -140,7 +140,12 @@ a.box-backup:hover i, a.box-backup:hover p {
color: #FBE500;
}
.alert-box.warning, .alert-box.error {
.alert-box.success {
background-color: #1ABC9C;
border-color: #16A085;
}
.alert-box.error {
background-color: #C0392A;
border-color: #C0392A;
color: #fff;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

View File

@ -147,7 +147,7 @@
<div class="signin" ng-controller="SigninController">
<div data-alert class="alert-box info radius" ng-show="loading">
<i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
Looking for peers...
Authenticating and Looking for peers...
</div>
<div ng-show="!loading">
<div class="row">
@ -486,10 +486,10 @@
<input type="text" id="address" name="address" placeholder="Send to" ng-model="address" valid-address required>
</div>
<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 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 id="scanner" class="row" ng-if="showScanner">

View File

@ -31,6 +31,7 @@ angular.module('copay.signin').controller('SigninController',
if (!w) {
$scope.loading = false;
$rootScope.flashMessage = { message: 'Bad password or connection error', type: 'error'};
$rootScope.$digest();
return;
}
controllerUtils.startNetwork(w);

View File

@ -72,7 +72,7 @@ angular.module('copay.directives')
var text = attr.loading;
scope.$watch('loading', function(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 {
element.html(a);
}