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

Minor ui fixes #334

Merged
merged 4 commits into from
Jun 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/delegateRegistration/delegateRegistration.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions src/components/passphrase/savePassphrase.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +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;
}
}

1 change: 1 addition & 0 deletions src/components/passphrase/savePassphrase.pug
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/components/send/send.pug
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ 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
div.relative-block
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
Expand Down
8 changes: 4 additions & 4 deletions src/components/transactions/transactions.pug
Original file line number Diff line number Diff line change
@@ -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)
Expand Down