From 2bb01e0c8af5bc9ec9852e46ac33e8f665412ed5 Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Tue, 6 Jun 2017 23:24:40 +0300 Subject: [PATCH 1/2] minor ui fixes --- .../delegateRegistration/delegateRegistration.pug | 2 ++ src/components/passphrase/savePassphrase.less | 10 ++++++++++ src/components/passphrase/savePassphrase.pug | 1 + src/components/send/send.pug | 4 ++-- src/components/transactions/transactions.pug | 8 ++++---- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/delegateRegistration/delegateRegistration.pug b/src/components/delegateRegistration/delegateRegistration.pug index 72299c14f..393adc8cf 100644 --- a/src/components/delegateRegistration/delegateRegistration.pug +++ b/src/components/delegateRegistration/delegateRegistration.pug @@ -14,6 +14,8 @@ div.dialog-delegate-registration(aria-label='Vote for delegates') input.username(type='text', name='delegateName', ng-model='$ctrl.form.name', required, ng-disabled='$ctrl.loading', md-autofocus) div(ng-messages='delegateRegistrationForm.name.$error') div(ng-message='required') Required + md-input-container.md-block(ng-if='!$ctrl.account.get().secondSignature') + div.fee Fee: {{$ctrl.form.fee}} LSK md-input-container.md-block(ng-if='$ctrl.account.get().secondSignature') label Second Passphrase input(type='password', ng-model='$ctrl.form.secondPassphrase', required) diff --git a/src/components/passphrase/savePassphrase.less b/src/components/passphrase/savePassphrase.less index dd06c3187..3f636e470 100644 --- a/src/components/passphrase/savePassphrase.less +++ b/src/components/passphrase/savePassphrase.less @@ -5,4 +5,14 @@ save-passphrase { color: rgb(2,136,209); } } +.fee { + position: absolute; + left: auto; + right: 6px; + bottom: 7px; + font-size: 12px; + line-height: 14px; + transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); + color: grey; +} diff --git a/src/components/passphrase/savePassphrase.pug b/src/components/passphrase/savePassphrase.pug index fe2ac65fd..4d93bf39d 100644 --- a/src/components/passphrase/savePassphrase.pug +++ b/src/components/passphrase/savePassphrase.pug @@ -30,6 +30,7 @@ form(ng-if='$ctrl.step === 2') md-input-container.md-block(md-is-error='!$ctrl.missing_ok') label Enter the missing word input(ng-model='$ctrl.missing_input', md-autofocus, aria-label='Enter the missing word') + div.fee Fee: 25 LSK md-dialog-actions(layout='row') md-button.back-button(ng-click="$ctrl.back()") Back span(flex) diff --git a/src/components/send/send.pug b/src/components/send/send.pug index d63d888f5..f6b158bcb 100644 --- a/src/components/send/send.pug +++ b/src/components/send/send.pug @@ -11,7 +11,7 @@ div.dialog-send(aria-label='Send funds') div md-input-container.md-block label Recipient Address - input.recipient(type='text', name='recipient', ng-model='$ctrl.recipient.value', required, ng-pattern='$ctrl.recipient.regexp', ng-disabled='$ctrl.loading') + input.recipient(type='text', name='recipient', ng-model='$ctrl.recipient.value', md-autofocus, required, ng-pattern='$ctrl.recipient.regexp', ng-disabled='$ctrl.loading') div(ng-messages='$ctrl.transferForm.recipient.$error') div(ng-message='required') Required div(ng-message='pattern') Invalid @@ -19,7 +19,7 @@ div.dialog-send(aria-label='Send funds') md-input-container.md-block label Transaction Amount input.amount(type='text', name='amount', ng-model='$ctrl.amount.value', required, ng-pattern='$ctrl.amount.regexp', ng-disabled='$ctrl.loading') - div.fee(ng-show='$ctrl.amount.value') Fee: 0.1 LSK + div.fee Fee: 0.1 LSK div(ng-messages='$ctrl.transferForm.amount.$error') div(ng-message='required') Required div(ng-message='pattern') Invalid diff --git a/src/components/transactions/transactions.pug b/src/components/transactions/transactions.pug index 74dbb5e07..19ce36c1b 100644 --- a/src/components/transactions/transactions.pug +++ b/src/components/transactions/transactions.pug @@ -1,9 +1,9 @@ md-card.offline-hide - md-card-content - md-content(layout='row', layout-align='start center', layout-padding) + md-card-content(ng-show='$ctrl.loaded') + md-content(layout='row', layout-align='start center', layout-padding, ng-show='!$ctrl.transactions.length') div(flex) - span.empty(ng-show='!$ctrl.transactions.length && $ctrl.loaded') No transactions - md-content(layout='column', layout-align='center center') + span.empty No transactions + md-content(layout='column', layout-align='center center', ng-hide='!$ctrl.transactions.length') md-table-container(ng-show='$ctrl.transactions.length') table(md-table) thead(md-head) From b45bc0e2183aaab14e0934faee74b8b413e228ae Mon Sep 17 00:00:00 2001 From: Aleksey Popov Date: Wed, 7 Jun 2017 14:41:53 +0300 Subject: [PATCH 2/2] fix style name collision --- src/components/passphrase/savePassphrase.less | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/passphrase/savePassphrase.less b/src/components/passphrase/savePassphrase.less index 3f636e470..2b15240bb 100644 --- a/src/components/passphrase/savePassphrase.less +++ b/src/components/passphrase/savePassphrase.less @@ -4,15 +4,15 @@ save-passphrase { font-weight: bold; color: rgb(2,136,209); } -} -.fee { - position: absolute; - left: auto; - right: 6px; - bottom: 7px; - font-size: 12px; - line-height: 14px; - transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); - color: grey; + .fee { + position: absolute; + left: auto; + right: 6px; + bottom: 7px; + font-size: 12px; + line-height: 14px; + transition: all 0.3s cubic-bezier(0.55, 0, 0.55, 0.2); + color: grey; + } }