makes style more inline with status theme

This commit is contained in:
Barry Gitarts 2018-06-12 14:08:25 -04:00
parent e3511e397f
commit 984600ed16
3 changed files with 20 additions and 17 deletions

View File

@ -21,7 +21,8 @@ const hashedDomain = domainName => hash(getDomain(domainName));
const cardStyle = {
width: '75%',
marginLeft: '15%',
padding: '30px'
padding: '30px',
height: '425px'
}
const addressStyle = {
@ -82,7 +83,7 @@ class Register extends PureComponent {
{!registered ?
<Fragment>
<Info.Action title="No address is associated with this domain">
{formattedDomain.toUpperCase()} can be registered for {domainPrice} SNT
<span style={{ color: theme.accent }}>{formattedDomain.toUpperCase()}</span> can be registered for {domainPrice} SNT
</Info.Action>
<RegisterSubDomain
subDomain={formattedDomainArray[0]}
@ -97,15 +98,15 @@ class Register extends PureComponent {
}
}
const DisplayAddress = ({ domainName, address, statusAccount, setStatus }) => (
const DisplayAddress = (props) => (
<Fragment>
{validAddress(address) ?
<RenderAddresses {...this.props} />
{validAddress(props.address) ?
<RenderAddresses {...props} />
:
<Info.Action title="No address is associated with this domain">
{domainName.toUpperCase()}
{props.domainName.toUpperCase()}
</Info.Action>}
<div style={backButton} onClick={() => setStatus(null)}>&larr;</div>
<div style={backButton} onClick={() => props.setStatus(null)}>&larr;</div>
</Fragment>
)
@ -132,7 +133,7 @@ const InnerForm = ({
required />
</Field>
<Button mode="strong" type="submit" wide>
Get Address
Lookup Address
</Button>
</form>
: validAddress(status.address) ?

View File

@ -1,8 +1,7 @@
import web3 from "Embark/web3"
import ENSSubdomainRegistry from 'Embark/contracts/ENSSubdomainRegistry';
import ENSRegistry from 'Embark/contracts/ENSRegistry';
import React from 'react';
import { Button } from 'react-bootstrap';
import { Button } from '../../ui/components';
import { withFormik } from 'formik';
import { hash } from 'eth-ens-namehash';
import { zeroAddress, zeroBytes32 } from './utils';
@ -44,6 +43,7 @@ const InnerForm = ({
value={values.domainName}
button={
<Button
mode="strong"
style={{ marginTop: '5px' }}
onClick={() => {
ENSSubdomainRegistry.methods.getPrice(hash(values.domainName))
@ -81,11 +81,11 @@ const InnerForm = ({
onBlur={handleBlur}
value={values.address}
error={errors.address}
button={<Button style={{ marginTop: '5px' }} onClick={() => setFieldValue('address', web3.eth.defaultAccount)}>Use My Primary Address</Button>}
button={<Button mode="strong" style={{ padding: '5px 15px 5px 15px', marginTop: '5px' }} onClick={() => setFieldValue('address', web3.eth.defaultAccount)}>Use My Primary Address</Button>}
/>
<Button bsStyle="primary" type="submit" disabled={isSubmitting || !!Object.keys(errors).length}>{!isSubmitting ? 'Submit' : 'Submitting to the Blockchain - (this may take awhile)'}</Button>
<Button wide mode="strong" type="submit" disabled={isSubmitting || !!Object.keys(errors).length}>{!isSubmitting ? 'Submit' : 'Submitting to the Blockchain - (this may take awhile)'}</Button>
</form>
)
);
const RegisterSubDomain = withFormik({
mapPropsToValues: props => ({ subDomain: '', domainName: '', price: '' }),

View File

@ -16,6 +16,8 @@
"Aqua Blue": "#F7FBFD"
},
"Blue": {
"Main": "#4360DF",
"Light": "#95A8F8",
"Lochmara": "#028BCF",
"Danube": "#7FADDC",
"Spindle": "#B3CFEA",
@ -55,15 +57,15 @@
"White": "#FFFFFF"
},
"Status Brand": {
"Primary": "=Purple.Indigo",
"Primary": "=Blue.Main",
"Secondary": "=Sea.Turquoise",
"Black Ash": "=Grey.Black Ash",
"Gradient Start": "=Eagle.Cerulean",
"Gradient End": "=Eagle.Opal"
},
"Status UI": {
"gradientStart": "=Eagle.Cerulean",
"gradientEnd": "=Eagle.Opal",
"gradientStart": "=Blue.Main",
"gradientEnd": "=Blue.Light",
"gradientStartActive": "=Eagle.Dark Cerulean",
"gradientEndActive": "=Eagle.Dark Opal",
"gradientText": "=White.White",
@ -86,7 +88,7 @@
"textDimmed": "=Grey.Black Ash",
"textSecondary": "=Grey.Dim Grey",
"textTertiary": "=Grey.Light Grey",
"accent": "=Eagle.Dark Turquoise",
"accent": "=Blue.Main",
"positive": "=Green.Spring Green",
"positiveText": "=White.White",
"negative": "=Red.Salmon Red",