From 04b6114d8f58ad5ef19041f9bdd057e580d0cd96 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Tue, 6 Jun 2017 16:50:13 +0200 Subject: [PATCH 1/2] Move online/offline icon inside node element - Closes #320 --- src/components/top/top.less | 1 + src/components/top/top.pug | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/top/top.less b/src/components/top/top.less index 0df80bad2..52cfc5955 100644 --- a/src/components/top/top.less +++ b/src/components/top/top.less @@ -27,6 +27,7 @@ top { } } .value-wrapper { + position: relative; width: 100%; height: 70px; text-align: center; diff --git a/src/components/top/top.pug b/src/components/top/top.pug index 18d9ecf76..5a3784083 100644 --- a/src/components/top/top.pug +++ b/src/components/top/top.pug @@ -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") From 7e011587ab300dcff0ac5d3ce0b82dc8d4fb4ae2 Mon Sep 17 00:00:00 2001 From: Vit Stanislav Date: Wed, 7 Jun 2017 09:09:58 +0200 Subject: [PATCH 2/2] Make passphrase.init unit test stable --- test/services/passphrase.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/services/passphrase.spec.js b/test/services/passphrase.spec.js index f781f4b5d..0025f89ff 100644 --- a/test/services/passphrase.spec.js +++ b/test/services/passphrase.spec.js @@ -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()', () => {