m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Send screen style updates. (#3234)

Browse Source
This commit is contained in:
Dan J Miller 2018-02-13 03:09:15 -03:30 committed by Alexander Tseung
parent fe2ed68f11
commit e4c83466be
4 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/css/itcss/components/currency-display.scss
View File

@ -4,7 +4,7 @@
border: 1px solid $alto; border: 1px solid $alto;
border-radius: 4px; border-radius: 4px;
background-color: $white; background-color: $white;
color: $dusty-gray; color: $scorpion;
font-family: Roboto; font-family: Roboto;
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
@ -52,5 +52,6 @@
&__currency-symbol { &__currency-symbol {
margin-top: 1px; margin-top: 1px;
color: $scorpion;
} }
} }

22
ui/app/css/itcss/components/send.scss
View File

@ -557,6 +557,25 @@
&__form-field { &__form-field {
flex: 1 1 auto; flex: 1 1 auto;
.currency-display {
color: $tundora;
&__currency-symbol {
color: $tundora;
}
&__converted-value,
&__converted-currency {
color: $tundora;
}
}
.account-list-item {
&__account-secondary-balance {
color: $tundora;
}
}
} }
&__form-label { &__form-label {
@ -565,6 +584,7 @@
font-size: 16px; font-size: 16px;
line-height: 22px; line-height: 22px;
width: 88px; width: 88px;
font-weight: 400;
} }
&__from-dropdown { &__from-dropdown {
@ -620,7 +640,7 @@
border: 1px solid $alto; border: 1px solid $alto;
border-radius: 4px; border-radius: 4px;
background-color: $white; background-color: $white;
color: $dusty-gray; color: $tundora;
padding: 10px; padding: 10px;
font-family: Roboto; font-family: Roboto;
font-size: 16px; font-size: 16px;

23
ui/app/css/itcss/generic/index.scss
View File

@ -82,8 +82,20 @@ input.large-input {
display: flex; display: flex;
flex-flow: column; flex-flow: column;
border-bottom: 1px solid $geyser; border-bottom: 1px solid $geyser;
padding: 1.6rem 1rem; padding: 1.15rem 0.95rem;
flex: 0 0 auto; flex: 0 0 auto;
background: $alabaster;
position: relative;
}
&__header-close::after {
content: '\00D7';
font-size: 40px;
color: $tundora;
position: absolute;
top: 21.5px;
right: 28.5px;
cursor: pointer;
} }
&__footer { &__footer {
@ -93,6 +105,11 @@ input.large-input {
border-top: 1px solid $geyser; border-top: 1px solid $geyser;
padding: 1.6rem; padding: 1.6rem;
flex: 0 0 auto; flex: 0 0 auto;
.btn-clear,
.btn-cancel {
font-size: 1rem;
}
} }
&__footer-button { &__footer-button {
@ -101,6 +118,7 @@ input.large-input {
font-size: 1rem; font-size: 1rem;
text-transform: uppercase; text-transform: uppercase;
margin-right: 1rem; margin-right: 1rem;
border-radius: 2px;
&:last-of-type { &:last-of-type {
margin-right: 0; margin-right: 0;
@ -108,7 +126,7 @@ input.large-input {
} }
&__title { &__title {
color: $tundora; color: $black;
font-family: Roboto; font-family: Roboto;
font-size: 2rem; font-size: 2rem;
font-weight: 500; font-weight: 500;
@ -119,6 +137,7 @@ input.large-input {
padding-top: .5rem; padding-top: .5rem;
line-height: initial; line-height: initial;
font-size: .9rem; font-size: .9rem;
color: $gray;
} }
&__tabs { &__tabs {

13
ui/app/send-v2.js
View File

@ -179,7 +179,7 @@ SendTransactionScreen.prototype.componentDidUpdate = function (prevProps) {
} }
SendTransactionScreen.prototype.renderHeader = function () { SendTransactionScreen.prototype.renderHeader = function () {
const { selectedToken } = this.props const { selectedToken, clearSend, goHome } = this.props
const tokenText = selectedToken ? 'tokens' : 'ETH' const tokenText = selectedToken ? 'tokens' : 'ETH'
return h('div.page-container__header', [ return h('div.page-container__header', [
@ -188,10 +188,13 @@ SendTransactionScreen.prototype.renderHeader = function () {
h('div.page-container__subtitle', `Only send ${tokenText} to an Ethereum address.`), h('div.page-container__subtitle', `Only send ${tokenText} to an Ethereum address.`),
h( h('div.page-container__header-close', {
'div.page-container__subtitle', onClick: () => {
'Sending to a different crytpocurrency that is not Ethereum may result in permanent loss.' clearSend()
), goHome()
},
}),
]) ])
} }