Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #324 from LiskHQ/320-move-online-icon
Browse files Browse the repository at this point in the history
Move online/offline icon inside node element - Closes #320
  • Loading branch information
slaweet authored Jun 7, 2017
2 parents 238df4a + e71cd10 commit 96740fd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/components/top/top.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ top {
}
}
.value-wrapper {
position: relative;
width: 100%;
height: 70px;
text-align: center;
Expand Down
6 changes: 3 additions & 3 deletions src/components/top/top.pug
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ md-content(layout='column', layout-gt-xs='row')
small.username.secondary {{ $ctrl.account.get().address }}
md-card.peer.offline-hide(flex-gt-xs=33)
md-card-content(layout='column', layout-align='center center')
span.status
i.material-icons.offline(ng-show='!$ctrl.peers.online') error
i.material-icons.online(ng-show='$ctrl.peers.online') check circle
span.md-title.title Peer
div.value-wrapper
span.status
i.material-icons.offline(ng-show='!$ctrl.peers.online') error
i.material-icons.online(ng-show='$ctrl.peers.online') check circle
span.primary {{ $ctrl.peers.active.options.name }}
div.active-peer.value.secondary
span(ng-bind="$ctrl.peers.active.currentPeer")
Expand Down
4 changes: 2 additions & 2 deletions test/services/passphrase.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ describe('Factory: Passphrase', () => {
});

describe('Passphrase.init()', () => {
it('should define progress.steps as a number above 1.6', () => {
it('should define progress.steps as a number above or equal to 1.6', () => {
Passphrase.init();
expect(Passphrase.progress.step).to.be.above(1.6);
expect(Passphrase.progress.step).to.not.be.below(1.6);
});

it('should call Passphrase.reset()', () => {
Expand Down

0 comments on commit 96740fd

Please sign in to comment.