Skip to content

Commit

Permalink
verify message update
Browse files Browse the repository at this point in the history
  • Loading branch information
hsurf22 committed Aug 7, 2018
1 parent 6f9eb69 commit db3f6bb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 211 deletions.
2 changes: 1 addition & 1 deletion src/components/ScrollUpButton/ScrollUpButton.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.scroll-up-button {
position: fixed;
bottom: 5vh;
right: 5vw;
right: 4vw;

.button-block {
img {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
.title {
align-items: flex-end;
display: flex;
align-items: center;
margin-bottom: 10px;
padding: 0 8px;
width: 100%;
Expand Down Expand Up @@ -96,165 +97,10 @@
}
}
}
}

.send-form2 {
padding: 40px 60px 0;

.title-container {
align-items: flex-end;
display: flex;
margin-bottom: 10px;

.title {
padding: 0 8px;

.title-and-popover {
display: flex;
}

h4 {
margin-bottom: 2px;
}
}

.buttons {
margin-bottom: 3px;
margin-left: auto;
}
}

.form-block {
border-radius: 5px;

.the-form {
background-color: $background-color-1;
border-radius: 5px;
}
}

.amount-to-address {
display: grid;
grid-column-gap: 5px;
grid-template-columns: 1fr 70px 1fr;

.title {
margin-bottom: 13px;
padding: 0 8px;
}

.exchange-icon {
color: $text-color-9;
font-size: 30px;
padding-top: 62px;
text-align: center;
}

.amount {
.dropdown-select-search-1 {
background-color: $background-color-1;
margin-bottom: 5px;
position: relative;

i {
color: $text-color-2;
left: 14px;
position: absolute;
top: 16px;
}
}

.amount-number {
position: relative;

input {
background-color: transparent;
border: 0;
padding: 13px 15px;
width: 100%;
}

i {
position: absolute;
right: 13px;
top: 13px;
}
}
}

.to-address {
position: relative;

.title {
align-items: center;
display: flex;
position: relative;

img {
height: 50px;
left: 98px;
position: absolute;
top: -14px;
}

.copy-button {
color: $text--link-color;
cursor: pointer;
margin-left: auto;
}
}

.address-block {
height: 98px;

i {
bottom: 13px;
position: absolute;
right: 13px;
}

textarea {
background-color: transparent;
border: 0;
height: 100%;
padding: 13px 15px;
resize: none;
width: 100%;
}
}
}
}

.gas-amount {
position: relative;

input {
background-color: $background-color-1;
border: 0;
padding: 13px 15px;
width: 100%;
}

.good-button-container {
align-items: center;
display: flex;
position: absolute;
right: 10px;
top: 12px;

p {
color: $text--link-color;
margin-right: 10px;
}
}
}
} // .send-form

.error-message-container {
p {
color: $text-color-red;
margin: 7px 0 0 15px;
}
}
.send-form-small-top-margin {
padding-top: 10px;
}

.submit-button-container {
Expand All @@ -275,5 +121,6 @@
width: 300px;
}
}
}
}
} // .submit-button-container

} // .deploy-contract-container
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,8 @@
<div class="send-form">
<div class="title-container">
<div class="title">
<h4>Byte Code</h4>
<div class="copy-buttons">
<span v-on:click="deleteInput('bytecode')">Clear</span>
<span v-on:click="copyToClipboard('bytecode')">Copy</span>
</div>
</div>
</div>
<div class="the-form domain-name">
<input type="text" ref="bytecode" placeholder="Byte code">
</div>
</div>

<div class="send-form">
<div class="title-container">
<div class="title">
<h4>ABI/JSON Interface</h4>
<h4>{{ $t('common.signature') }}</h4>
<popover :popcontent="$t('popover.whatIsSignatureContent')"/>
<div class="copy-buttons">
<span v-on:click="deleteInputText('abi')">Clear</span>
<span v-on:click="copyToClipboard('abi')">Copy</span>
Expand All @@ -33,44 +19,16 @@
</div>
</div>

<div class="send-form2">
<div class="title-container">
<div class="title">
<div class="title-and-popover">
<h4>Speed of Transaction</h4>
<popover :popcontent="$t('popover.whatIsSpeedOfTransactionContent')"/>
</div>
<p>Transcation Fee: 0.000013 ETH ($1.234)</p>
</div>
<div class="buttons">
<div class="small-circle-button-green-border">
Slow
</div>
<div class="small-circle-button-green-border active">
Regular
</div>
<div class="small-circle-button-green-border">
Fast
</div>
</div>
</div>

<div class="the-form gas-amount">
<input type="number" name="" value="" placeholder="Gas Amount">
<div class="good-button-container">
<p>Gwei</p>
<i class="fa fa-check-circle good-button not-good" aria-hidden="true"></i>
</div>
<div class="send-form send-form-small-top-margin">
<div class="the-form domain-name">
<input type="text" ref="bytecode" placeholder="Byte code">
</div>
</div>

<div class="submit-button-container">
<div class="buttons">
<div class="submit-button large-round-button-green-border clickable">
{{ $t('common.continue') }}
</div>
<div v-on:click="successModalOpen" class="submit-button large-round-button-green-filled clickable">
{{ $t('interface.read') }}
{{ $t('common.verify') }}
</div>
</div>
<interface-bottom-text link="/" :linkText="$t('interface.learnMore')" :question="$t('interface.haveIssues')"></interface-bottom-text>
Expand Down Expand Up @@ -122,7 +80,7 @@ export default {
this.$refs[ref].select()
document.execCommand('copy')
},
deleteInput (ref) {
deleteInputText (ref) {
this.$refs[ref].value = ''
}
},
Expand Down
4 changes: 3 additions & 1 deletion src/translations/common/gb.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const common = {
next: 'Next',
totalBalance: 'Total Balance',
dontHaveEnough: 'You don\'t have enough funds',
verify: 'Verify',
copy: 'Copy',
clear: 'Clear',
slow: 'Slow',
Expand All @@ -45,6 +46,7 @@ const common = {
interactWcontract: 'Interact with Contract',
depContract: 'Deploy Contract',
signMessage: 'Sign Message',
verifyMessage: 'Verify Message'
verifyMessage: 'Verify Message',
signature: 'Signature'
}
export default common

1 comment on commit db3f6bb

@mew-bot
Copy link
Collaborator

@mew-bot mew-bot commented on db3f6bb Aug 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.