Skip to content

Commit

Permalink
Send ETH & Tokens style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@hsurf22
hsurf22 committed Aug 6, 2018
1 parent 020c4a3 commit f9a1c34
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 32 deletions.
2 changes: 1 addition & 1 deletion src/layouts/AccessWalletLayout/components/PrivateKeyModal/PrivateKeyModal.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Wallet from 'ethereumjs-wallet'
export default {
data () {
return {
privateKey: ''
privateKey: '563070852154f171267e8a79111f299e42baeda3acd5f0cf82d92e5feba31dea'
}
},
methods: {
Expand Down
39 changes: 27 additions & 12 deletions src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,23 @@
.to-address {
position: relative;

.blockie-image {
width: 30px;
height: 30px;
position: absolute;
right: -41px;
top: -4px;
}

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

h4 {
position: relative;
}

img {
height: 50px;
left: 98px;
Expand Down Expand Up @@ -178,24 +190,17 @@
padding-top: 10px;

.advanced-content {
padding: 20px 0;
border-bottom: 2px solid $background-color-1;
border-top: 2px solid $background-color-1;

.input-container {
padding-bottom: 10px;
.toggle-button-container {
display: flex;

.the-form:nth-child(1) {
margin-bottom: 5px;
h4 {
padding: 0 8px;
}

}

.title {
display: flex;
padding: 0 8px;
padding-bottom: 20px;
padding-top: 20px;

.toggle-button {
align-items: center;
display: flex;
Expand All @@ -205,8 +210,18 @@
>span {
margin-right: 15px;
}
} // .toggle-button
} // .toggle-button-container

.input-container {
margin-top: 20px;
margin-bottom: -15px;

.user-input {
margin-bottom: 5px;
}
}

}
}

Expand Down
42 changes: 23 additions & 19 deletions src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
</div>
<div class="to-address">
<div class="title">
<h4>{{ $t("interface.sendTxToAddr") }}</h4> &nbsp;
<blockie :address="toAddress" width="22px" height="22px" v-show="addressValid && toAddress.length !== 0"></blockie>
<h4>{{ $t("interface.sendTxToAddr") }}
<blockie class="blockie-image" :address="toAddress" v-show="addressValid && toAddress.length !== 0"></blockie>
</h4>

<p class="copy-button prevent-user-select" v-on:click="copyToClipboard('address')">{{ $t('common.copy') }}</p>
</div>
<div class="the-form address-block">
Expand Down Expand Up @@ -68,26 +70,28 @@
</div>
<div class="send-form advanced">
<div class="advanced-content">
<h4>{{ $t('common.advanced') }}</h4>
<div class="toggle-button">
<span>{{ $t('interface.dataGas') }}</span>
<!-- Rounded switch -->
<div class="sliding-switch-white">
<label class="switch">
<input type="checkbox" v-on:click="advancedExpend = !advancedExpend" />
<span class="slider round"></span>
</label>
</div>
<br/>
<div class="input-container" v-if="advancedExpend">
<div class="the-form user-input">
<input type="text" name="" v-model="data" placeholder="Add Data (e.g. 0x7834f874g298hf298h234f)" autocomplete="off" />
</div>
<div class="the-form user-input">
<input type="number" name="" v-model="gasLimit" placeholder="Gas Limit" />

<div class="toggle-button-container">
<h4>{{ $t('common.advanced') }}</h4>
<div class="toggle-button">
<span>{{ $t('interface.dataGas') }}</span>
<!-- Rounded switch -->
<div class="sliding-switch-white">
<label class="switch">
<input type="checkbox" v-on:click="advancedExpend = !advancedExpend" />
<span class="slider round"></span>
</label>
</div>
</div>
</div>
<div class="input-container" v-if="advancedExpend">
<div class="the-form user-input">
<input type="text" name="" v-model="data" placeholder="Add Data (e.g. 0x7834f874g298hf298h234f)" autocomplete="off" />
</div>
<div class="the-form user-input">
<input type="number" name="" v-model="gasLimit" placeholder="Gas Limit" />
</div>
</div>
</div>
</div>

Expand Down

1 comment on commit f9a1c34

@mew-bot
Copy link
Collaborator

@mew-bot mew-bot commented on f9a1c34 Aug 6, 2018

Choose a reason for hiding this comment

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

Copy of this build can be found at https://www.mewbuilds.com/build/f9a1c34b4ff2daaef9cbdb160fd2d04b76b19e07/index.html

Please sign in to comment.