Merge remote-tracking branch 'syncthing/pr/1436'

* syncthing/pr/1436:
  Remove red if we managed to report to atleast one discovery server (fixes #1427)

Conflicts:
	internal/auto/gui.files.go
This commit is contained in:
Jakob Borg 2015-03-09 23:47:41 +01:00
commit 05642a3e17
2 changed files with 2 additions and 2 deletions

View File

@ -319,7 +319,7 @@
<span ng-if="announceServersFailed.length == 0" class="data text-success">
<span>OK</span>
</span>
<span ng-if="announceServersFailed.length != 0" class="data text-danger">
<span ng-if="announceServersFailed.length != 0" class="data" ng-class="{'text-danger': announceServersFailed.length == announceServersTotal}">
<span popover data-trigger="hover" data-placement="bottom" data-content="{{announceServersFailed.join('\n')}}">
{{announceServersTotal-announceServersFailed.length}}/{{announceServersTotal}}
</span>

File diff suppressed because one or more lines are too long