From 3162a2747c0e54f729405caaef777519e4ded4dc Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Thu, 25 Oct 2018 01:25:39 -0230 Subject: Redesign of gas customization basic tab. --- .../gas-price-button-group.component.js | 4 +- .../gas-price-button-group/index.scss | 96 ++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) (limited to 'ui/app/components/gas-customization/gas-price-button-group') diff --git a/ui/app/components/gas-customization/gas-price-button-group/gas-price-button-group.component.js b/ui/app/components/gas-customization/gas-price-button-group/gas-price-button-group.component.js index 62ebb512d..8ad063b21 100644 --- a/ui/app/components/gas-customization/gas-price-button-group/gas-price-button-group.component.js +++ b/ui/app/components/gas-customization/gas-price-button-group/gas-price-button-group.component.js @@ -38,10 +38,10 @@ export default class GasPriceButtonGroup extends Component { }) { return (
{ labelKey &&
{ this.context.t(labelKey) }
} + { timeEstimate &&
{ timeEstimate }
} { feeInPrimaryCurrency &&
{ feeInPrimaryCurrency }
} { feeInSecondaryCurrency &&
{ feeInSecondaryCurrency }
} - { timeEstimate &&
{ timeEstimate }
} - { showCheck && } + { showCheck &&
}
) } diff --git a/ui/app/components/gas-customization/gas-price-button-group/index.scss b/ui/app/components/gas-customization/gas-price-button-group/index.scss index 7647c42c0..22661ed7b 100644 --- a/ui/app/components/gas-customization/gas-price-button-group/index.scss +++ b/ui/app/components/gas-customization/gas-price-button-group/index.scss @@ -125,3 +125,99 @@ } } } + +.gas-price-button-group--alt { + display: flex; + justify-content: stretch; + max-width: 342px; + + &__button-fiat-price { + font-size: 13px; + } + + &__button-label { + font-size: 16px; + } + + &__label { + font-weight: 500; + font-size: 10px; + text-transform: capitalize; + } + + &__primary-currency { + font-size: 11px; + margin-top: 3px; + } + + &__secondary-currency { + font-size: 11px; + } + + &__loading-container { + height: 78px; + } + + &__time-estimate { + font-size: 14px; + font-weight: 500; + margin-top: 4px; + color: $black; + } + + .button-group__button, .button-group__button--active { + height: 78px; + background: white; + color: #2A4055; + width: 108px; + height: 97px; + box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.151579); + border-radius: 6px; + border: none; + + div { + display: flex; + flex-flow: column;; + align-items: flex-start; + justify-content: flex-start; + position: relative; + } + + .button-check-wrapper { + display: none; + } + + &:first-child { + margin-right: 6px; + } + + &:last-child { + margin-left: 6px; + } + } + + .button-group__button--active { + background: #F7FCFF; + border: 2px solid #2C8BDC; + + .button-check-wrapper { + height: 16px; + width: 16px; + border-radius: 8px; + position: absolute; + top: -11px; + right: -10px; + background: #D5ECFA; + display: flex; + flex-flow: row; + justify-content: center; + align-items: center; + } + + i { + display: flex; + color: $curious-blue; + font-size: 12px; + } + } +} -- cgit